mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
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
This commit is contained in:
@@ -282,8 +282,7 @@
|
|||||||
description-id="add_user_group_description"/>
|
description-id="add_user_group_description"/>
|
||||||
|
|
||||||
<dialog name="removeContentUser" page="/jsp/roles/remove-content-user.jsp" managed-bean="RemoveContentUserDialog"
|
<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"
|
icon="/images/icons/delete_large.gif" description-id="remove_content_user_info" />
|
||||||
description-id="remove_content_user_confirm" />
|
|
||||||
|
|
||||||
<dialog name="editFileDialog" page="/jsp/dialog/edit-file.jsp" managed-bean="EditFileDialog"
|
<dialog name="editFileDialog" page="/jsp/dialog/edit-file.jsp" managed-bean="EditFileDialog"
|
||||||
icon="/images/icons/edit_large.gif" title-id="title_edit_file"
|
icon="/images/icons/edit_large.gif" title-id="title_edit_file"
|
||||||
|
@@ -27,11 +27,20 @@ package org.alfresco.web.bean.users;
|
|||||||
import javax.faces.context.FacesContext;
|
import javax.faces.context.FacesContext;
|
||||||
import javax.faces.event.ActionEvent;
|
import javax.faces.event.ActionEvent;
|
||||||
|
|
||||||
|
import org.alfresco.web.app.Application;
|
||||||
import org.alfresco.web.bean.dialog.BaseDialogBean;
|
import org.alfresco.web.bean.dialog.BaseDialogBean;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of remove content user dialog.
|
||||||
|
*
|
||||||
|
* @author gavinc
|
||||||
|
*/
|
||||||
public class RemoveContentUserDialog extends BaseDialogBean
|
public class RemoveContentUserDialog extends BaseDialogBean
|
||||||
{
|
{
|
||||||
|
private static final String MSG_REMOVE_USER = "remove_user";
|
||||||
|
|
||||||
private ContentUsersBean contentUsersBean;
|
private ContentUsersBean contentUsersBean;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean getFinishButtonDisabled()
|
public boolean getFinishButtonDisabled()
|
||||||
{
|
{
|
||||||
@@ -42,9 +51,23 @@ public class RemoveContentUserDialog extends BaseDialogBean
|
|||||||
protected String finishImpl(FacesContext context, String outcome) throws Exception
|
protected String finishImpl(FacesContext context, String outcome) throws Exception
|
||||||
{
|
{
|
||||||
contentUsersBean.removeOK();
|
contentUsersBean.removeOK();
|
||||||
|
|
||||||
return outcome;
|
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)
|
public void setupUserAction(ActionEvent event)
|
||||||
{
|
{
|
||||||
this.contentUsersBean.setupUserAction(event);
|
this.contentUsersBean.setupUserAction(event);
|
||||||
@@ -69,5 +92,4 @@ public class RemoveContentUserDialog extends BaseDialogBean
|
|||||||
{
|
{
|
||||||
this.contentUsersBean = contentUsersBean;
|
this.contentUsersBean = contentUsersBean;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -4347,6 +4347,10 @@
|
|||||||
org.alfresco.web.bean.users.RemoveContentUserDialog
|
org.alfresco.web.bean.users.RemoveContentUserDialog
|
||||||
</managed-bean-class>
|
</managed-bean-class>
|
||||||
<managed-bean-scope>session</managed-bean-scope>
|
<managed-bean-scope>session</managed-bean-scope>
|
||||||
|
<managed-property>
|
||||||
|
<property-name>browseBean</property-name>
|
||||||
|
<value>#{BrowseBean}</value>
|
||||||
|
</managed-property>
|
||||||
<managed-property>
|
<managed-property>
|
||||||
<property-name>contentUsersBean</property-name>
|
<property-name>contentUsersBean</property-name>
|
||||||
<value>#{ContentUsersBean}</value>
|
<value>#{ContentUsersBean}</value>
|
||||||
|
Reference in New Issue
Block a user