inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2 to HEAD

Browse Source 
16841: Fix for ETHREEOH-3046 - discussion post replies and further post content now all set to UTF-8 encoding format.
   16853: Merged V3.1 to V3.2
      13681: Disable CMIS Web Services.
      13958: ETHREEOH-1625 - Incorrect save file process via Office Addin
      14026: ETHREEOH-1805 - update GET login web script description to recommend use of POST login web script instead.
   16861: Merged V3.1 to V3.2
      14162: ETHREEOH-1733 - multiday events display correctly
      14273: fix for ETHREEOH-2031
      14274: fix for event not adjusted by height issue in week view, after adding
   16867: Merged V3.1 to V3.2
      15429: The solution is to remove 'label' and 'description attributes' and add appropriate 'label-id' and 'description-id' attributes in 
   web-client\config\alfresco\web-client-config.xml for dashlets. Appropriate ids were added into webclient.properties.
      16677: ETHREEOH-1208 - Upload/recall documents with apostrophe/accent via Alfresco Office plugin
   16869: Merged V3.1 to V3.2
      16848: Merged V2.2 to V3.1
         15217: Fix for ETWOTWO-1268. Check for existence of desired control on first step of the dialog.
         15218: Fix for ETWOTWO-1269. Remove node.hasPermission(PermissionService.CREATE_CHILDREN) from CheckoutDocEvaluator#evaluate method (like 3.2 version).
      16849: Merged V2.2 to V3.1
         15424: ETWOTWO-1349
      16851: Merged V2.2 to V3.1
         15432: **RECORD ONLY** Input characters validation script was modified to disallow  !@#$%^&*().
         15433: This check-in fixes ETWOTWO-1351, ETWOTWO-1352, ETWOTWO-1353 because their behaviour is similar.
   16874: Merged DEV/TEMPORARY to V3.2
      16789: ETHREEOH-1895: Incorrect working of Link Destination Details
      16790: ETHREEOH-2372: Incorrect working of Link Destination Details
      16791: ETHREEOH-2342: Error message appear when "Coordinator" try to remove himself from the space
      16793: ETHREEOH-1364 & ETHREEOH-1367
      16794: ETHREEOH-2358: Letters and special symbols can be typed in Date value of property while creation of Content Rule and it leads to error
      16837: ETHREEOH-2631: two jsp:root elements cause compilation error in Weblogic 10.3.1

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16956 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-10-15 10:38:44 +00:00
parent 755abcca82
commit c350b0140a
14 changed files with 193 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/java/org/alfresco/web/bean/admin/ImportDialog.java
View File

@@ -32,6 +32,7 @@ import java.util.Map;
import javax.faces.context.FacesContext;
import org.alfresco.i18n.I18NUtil;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.action.executer.ImporterActionExecuter;
import org.alfresco.repo.content.MimetypeMap;
@@ -42,6 +43,7 @@ import org.alfresco.service.cmr.action.ActionService;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.DuplicateChildNodeNameException;
import org.alfresco.service.cmr.repository.MimetypeService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.NamespaceService;
@@ -69,6 +71,7 @@ public class ImportDialog extends BaseDialogBean
private static final String DEFAULT_OUTCOME = "dialog:close";
private static final String MSG_ERROR = "error_import";
private static final String ERR_DUPLICATE_NAME = "system.err.duplicate_name";
private static final String MSG_ERROR_NO_FILE = "error_import_no_file";
private static final String MSG_ERROR_EMPTY_FILE = "error_import_empty_file";
private static final String MSG_OK = "ok";
@@ -139,8 +142,18 @@ public class ImportDialog extends BaseDialogBean
}
catch (Throwable e)
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
FacesContext.getCurrentInstance(), MSG_ERROR), e.toString()), e);
if (e instanceof DuplicateChildNodeNameException)
{
String name = ((DuplicateChildNodeNameException)e).getName();
String err_mess = MessageFormat.format(I18NUtil.getMessage(ERR_DUPLICATE_NAME), name);
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
FacesContext.getCurrentInstance(), MSG_ERROR), err_mess), e);
}
else
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
FacesContext.getCurrentInstance(), MSG_ERROR), e.toString()), e);
}
outcome = null;
ReportedException.throwIfNecessary(e);
}

3
source/java/org/alfresco/web/bean/forums/CreatePostDialog.java
View File

@@ -69,6 +69,9 @@ public class CreatePostDialog extends CreateContentWizard
// remove link breaks and replace with <br>
this.content = Utils.replaceLineBreaks(this.content, false);
// set UTF-8 encoding for the post (all original posts are UTF-8 also)
this.encoding = "UTF-8";
return super.finishImpl(context, outcome);
}

37
source/java/org/alfresco/web/bean/users/RemoveInvitedUserDialog.java
View File

@@ -30,7 +30,8 @@ import javax.faces.event.ActionEvent;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.dialog.BaseDialogBean;
public class RemoveInvitedUserDialog extends BaseDialogBean {
public class RemoveInvitedUserDialog extends BaseDialogBean
{
private static final long serialVersionUID = -7457234588814115434L;
@@ -45,43 +46,51 @@ public class RemoveInvitedUserDialog extends BaseDialogBean {
private SpaceUsersBean spaceUsersBean;
@Override
public boolean getFinishButtonDisabled() {
public boolean getFinishButtonDisabled()
{
return false;
}
@Override
protected String finishImpl(FacesContext context, String outcome) throws Exception {
spaceUsersBean.removeOK();
return outcome;
protected String finishImpl(FacesContext context, String outcome) throws Exception
{
return spaceUsersBean.removeOK();
}
public void setupUserAction(ActionEvent event) {
public void setupUserAction(ActionEvent event)
{
spaceUsersBean.setupUserAction(event);
}
public String getPersonName() {
public String getPersonName()
{
return spaceUsersBean.getPersonName();
}
public void setPersonName(String personName) {
public void setPersonName(String personName)
{
this.spaceUsersBean.setPersonName(personName);
}
public SpaceUsersBean getSpaceUsersBean() {
public SpaceUsersBean getSpaceUsersBean()
{
return spaceUsersBean;
}
public void setSpaceUsersBean(SpaceUsersBean spaceUsersBean) {
public void setSpaceUsersBean(SpaceUsersBean spaceUsersBean)
{
this.spaceUsersBean = spaceUsersBean;
}
@Override
public String getCancelButtonLabel() {
public String getCancelButtonLabel()
{
return Application.getMessage(FacesContext.getCurrentInstance(), BUTTON_NO);
}
@Override
public String getFinishButtonLabel() {
public String getFinishButtonLabel()
{
return Application.getMessage(FacesContext.getCurrentInstance(), BUTTON_YES);
}
@@ -89,7 +98,7 @@ public class RemoveInvitedUserDialog extends BaseDialogBean {
public String getContainerTitle()
{
FacesContext fc = FacesContext.getCurrentInstance();
return Application.getMessage(fc, MSG_REMOVE_USER) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE)
+ spaceUsersBean.getPersonName() + Application.getMessage(fc, MSG_RIGHT_QUOTE);
return Application.getMessage(fc, MSG_REMOVE_USER) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + spaceUsersBean.getPersonName()
+ Application.getMessage(fc, MSG_RIGHT_QUOTE);
}
}

2
source/java/org/alfresco/web/bean/users/UserMembersBean.java
View File

@@ -851,7 +851,7 @@ public abstract class UserMembersBean extends BaseDialogBean implements IContext
*/
public String removeOK()
{
String outcome = OUTCOME_FINISH;
String outcome = getDefaultFinishOutcome();
UserTransaction tx = null;
FacesContext context = FacesContext.getCurrentInstance();