From ef2c90575855cc617fa31dfbba327a617ae1465b Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Fri, 21 Sep 2007 12:43:39 +0000
Subject: [PATCH] Fixed bug in one of the newly converted dialogs (description
 has unresolved bundle parameter)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/web-client-config-dialogs.xml |  3 +-
 .../bean/users/RemoveContentUserDialog.java   | 94 ++++++++++++-------
 source/web/WEB-INF/faces-config-beans.xml     |  4 +
 3 files changed, 63 insertions(+), 38 deletions(-)

diff --git a/config/alfresco/web-client-config-dialogs.xml b/config/alfresco/web-client-config-dialogs.xml
index 6d6a9aced2..9264710268 100644
--- a/config/alfresco/web-client-config-dialogs.xml
+++ b/config/alfresco/web-client-config-dialogs.xml
@@ -282,8 +282,7 @@
                  description-id="add_user_group_description"/>
          
          <dialog name="removeContentUser" page="/jsp/roles/remove-content-user.jsp" managed-bean="RemoveContentUserDialog"
-                 icon="/images/icons/delete_large.gif" title-id="title_remove_invited_user" 
-                 description-id="remove_content_user_confirm" />
+                 icon="/images/icons/delete_large.gif" description-id="remove_content_user_info" />
          
          <dialog name="editFileDialog" page="/jsp/dialog/edit-file.jsp" managed-bean="EditFileDialog"
                  icon="/images/icons/edit_large.gif" title-id="title_edit_file"
diff --git a/source/java/org/alfresco/web/bean/users/RemoveContentUserDialog.java b/source/java/org/alfresco/web/bean/users/RemoveContentUserDialog.java
index 950e619413..da30cb6833 100644
--- a/source/java/org/alfresco/web/bean/users/RemoveContentUserDialog.java
+++ b/source/java/org/alfresco/web/bean/users/RemoveContentUserDialog.java
@@ -27,47 +27,69 @@ package org.alfresco.web.bean.users;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ActionEvent;
 
+import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.dialog.BaseDialogBean;
 
+/**
+ * Implementation of remove content user dialog.
+ * 
+ * @author gavinc
+ */
 public class RemoveContentUserDialog extends BaseDialogBean
 {
-    private ContentUsersBean contentUsersBean;
-    @Override
-    public boolean getFinishButtonDisabled()
-    {
-        return false;
-    }
-    
-    @Override
-    protected String finishImpl(FacesContext context, String outcome) throws Exception
-    {
-        contentUsersBean.removeOK();
-        return outcome;
-    }
-    
-    public void setupUserAction(ActionEvent event)
-    {
-        this.contentUsersBean.setupUserAction(event);
-    }
-    
-    public String getPersonName()
-    {
-       return this.contentUsersBean.getPersonName();
-    }
+   private static final String MSG_REMOVE_USER = "remove_user";
+   
+   private ContentUsersBean contentUsersBean;
 
-    public void setPersonName(String personName)
-    {
-       this.contentUsersBean.setPersonName(personName);
-    }
-    
-    public ContentUsersBean getContentUsersBean()
-    {
-        return contentUsersBean;
-    }
+   @Override
+   public boolean getFinishButtonDisabled()
+   {
+      return false;
+   }
 
-    public void setContentUsersBean(ContentUsersBean contentUsersBean)
-    {
-        this.contentUsersBean = contentUsersBean;
-    }
+   @Override
+   protected String finishImpl(FacesContext context, String outcome) throws Exception
+   {
+      contentUsersBean.removeOK();
+      
+      return outcome;
+   }
 
+   @Override
+   public String getContainerTitle()
+   {
+      return Application.getMessage(FacesContext.getCurrentInstance(), MSG_REMOVE_USER) + 
+             " '" + this.getPersonName() + "'";
+   }
+   
+   @Override
+   public String getContainerSubTitle()
+   {
+      return this.browseBean.getDocument().getName();
+   }
+
+   public void setupUserAction(ActionEvent event)
+   {
+      this.contentUsersBean.setupUserAction(event);
+   }
+
+   public String getPersonName()
+   {
+      return this.contentUsersBean.getPersonName();
+   }
+
+   public void setPersonName(String personName)
+   {
+      this.contentUsersBean.setPersonName(personName);
+   }
+
+   public ContentUsersBean getContentUsersBean()
+   {
+      return contentUsersBean;
+   }
+
+   public void setContentUsersBean(ContentUsersBean contentUsersBean)
+   {
+      this.contentUsersBean = contentUsersBean;
+   }
 }
diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml
index d29d58a936..77f78aadc8 100644
--- a/source/web/WEB-INF/faces-config-beans.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -4347,6 +4347,10 @@
          org.alfresco.web.bean.users.RemoveContentUserDialog
       </managed-bean-class>
       <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
       <managed-property>
          <property-name>contentUsersBean</property-name>
          <value>#{ContentUsersBean}</value>