mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Fix for ALFCOM-2306
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -38,7 +38,6 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.faces.context.FacesContext;
|
||||
import javax.faces.context.ResponseWriter;
|
||||
import javax.faces.event.ActionEvent;
|
||||
import javax.transaction.UserTransaction;
|
||||
|
||||
@@ -1767,7 +1766,7 @@ public class BrowseBean implements IContextListener, Serializable
|
||||
|
||||
// remember the bean from wich the action comes
|
||||
DocumentDetailsDialog docDetails = (DocumentDetailsDialog)FacesContext.getCurrentInstance().getExternalContext().getSessionMap().get("DocumentDetailsDialog");
|
||||
docDetails.setTranslationDocument(new Node(translation));
|
||||
docDetails.setTranslationDocument(new MapNode(translation));
|
||||
|
||||
// set the ml container as the current document
|
||||
NodeRef mlContainer = getMultilingualContentService().getTranslationContainer(translation);
|
||||
|
@@ -220,11 +220,9 @@ public class MultilingualManageDialog extends BaseDialogBean
|
||||
@Override
|
||||
public String getCancelButtonLabel()
|
||||
{
|
||||
|
||||
return Application.getMessage(FacesContext.getCurrentInstance(), MSG_CLOSE);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns a list of objects representing the translations of the current document
|
||||
*
|
||||
@@ -535,5 +533,4 @@ public class MultilingualManageDialog extends BaseDialogBean
|
||||
resetMLDocument(null);
|
||||
return "dialog:close";
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -7,7 +7,7 @@
|
||||
|
||||
<managed-bean>
|
||||
<description>
|
||||
The bean for the Delete Category screen.
|
||||
The bean for the Manage Multilingual dialog.
|
||||
</description>
|
||||
<managed-bean-name>MultilingualManageDialog</managed-bean-name>
|
||||
<managed-bean-class>
|
||||
@@ -43,6 +43,7 @@
|
||||
<value>#{DocumentDetailsDialog.translationDocument}</value>
|
||||
</managed-property>
|
||||
</managed-bean>
|
||||
|
||||
<managed-bean>
|
||||
<description>
|
||||
The bean for the Manage Permissions.
|
||||
@@ -52,7 +53,6 @@
|
||||
org.alfresco.web.bean.wcm.ManagePermissionsDialog
|
||||
</managed-bean-class>
|
||||
<managed-bean-scope>session</managed-bean-scope>
|
||||
|
||||
<managed-property>
|
||||
<property-name>personService</property-name>
|
||||
<value>#{PersonService}</value>
|
||||
@@ -61,7 +61,6 @@
|
||||
<property-name>avmBrowseBean</property-name>
|
||||
<value>#{AVMBrowseBean}</value>
|
||||
</managed-property>
|
||||
|
||||
</managed-bean>
|
||||
|
||||
<managed-bean>
|
||||
|
Reference in New Issue
Block a user