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

Fix for ALFCOM-2306

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-01-12 14:55:29 +00:00
parent 34ca11c803
commit 10bc69cc63
3 changed files with 507 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/web/bean/BrowseBean.java
View File

@@ -38,7 +38,6 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.event.ActionEvent; import javax.faces.event.ActionEvent;
import javax.transaction.UserTransaction; import javax.transaction.UserTransaction;
@@ -1767,7 +1766,7 @@ public class BrowseBean implements IContextListener, Serializable
// remember the bean from wich the action comes // remember the bean from wich the action comes
DocumentDetailsDialog docDetails = (DocumentDetailsDialog)FacesContext.getCurrentInstance().getExternalContext().getSessionMap().get("DocumentDetailsDialog"); 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 // set the ml container as the current document
NodeRef mlContainer = getMultilingualContentService().getTranslationContainer(translation); NodeRef mlContainer = getMultilingualContentService().getTranslationContainer(translation);

3
source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java
View File

@@ -220,11 +220,9 @@ public class MultilingualManageDialog extends BaseDialogBean
@Override @Override
public String getCancelButtonLabel() public String getCancelButtonLabel()
{ {
return Application.getMessage(FacesContext.getCurrentInstance(), MSG_CLOSE); return Application.getMessage(FacesContext.getCurrentInstance(), MSG_CLOSE);
} }
/** /**
* Returns a list of objects representing the translations of the current document * Returns a list of objects representing the translations of the current document
* *
@@ -535,5 +533,4 @@ public class MultilingualManageDialog extends BaseDialogBean
resetMLDocument(null); resetMLDocument(null);
return "dialog:close"; return "dialog:close";
} }
} }

5
source/web/WEB-INF/faces-config-beans.xml
View File

@@ -7,7 +7,7 @@
<managed-bean> <managed-bean>
<description> <description>
The bean for the Delete Category screen. The bean for the Manage Multilingual dialog.
</description> </description>
<managed-bean-name>MultilingualManageDialog</managed-bean-name> <managed-bean-name>MultilingualManageDialog</managed-bean-name>
<managed-bean-class> <managed-bean-class>
@@ -43,6 +43,7 @@
<value>#{DocumentDetailsDialog.translationDocument}</value> <value>#{DocumentDetailsDialog.translationDocument}</value>
</managed-property> </managed-property>
</managed-bean> </managed-bean>
<managed-bean> <managed-bean>
<description> <description>
The bean for the Manage Permissions. The bean for the Manage Permissions.
@@ -52,7 +53,6 @@
org.alfresco.web.bean.wcm.ManagePermissionsDialog org.alfresco.web.bean.wcm.ManagePermissionsDialog
</managed-bean-class> </managed-bean-class>
<managed-bean-scope>session</managed-bean-scope> <managed-bean-scope>session</managed-bean-scope>
<managed-property> <managed-property>
<property-name>personService</property-name> <property-name>personService</property-name>
<value>#{PersonService}</value> <value>#{PersonService}</value>
@@ -61,7 +61,6 @@
<property-name>avmBrowseBean</property-name> <property-name>avmBrowseBean</property-name>
<value>#{AVMBrowseBean}</value> <value>#{AVMBrowseBean}</value>
</managed-property> </managed-property>
</managed-bean> </managed-bean>
<managed-bean> <managed-bean>