From 1eb2bca86c5d214f0d2591ddc7da16726896a84f Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Mon, 9 Apr 2012 11:09:47 +0200
Subject: [PATCH] Bug #1298: Mark to translate roles in user and profile
 edition

FEA: ItEr76S04BugFixing
---
 .../web/users/ProfileCRUDController.java      | 24 +++++++++++++++++
 .../web/users/UserCRUDController.java         | 27 +++++++++++++++++++
 .../src/main/webapp/users/_editProfile.zul    | 15 ++---------
 .../src/main/webapp/users/_editUser.zul       | 15 ++---------
 4 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java
index 29a6c3850..97bc2a5c7 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java
@@ -33,9 +33,14 @@ import org.libreplan.business.users.entities.UserRole;
 import org.libreplan.web.common.BaseCRUDController;
 import org.libreplan.web.common.Util;
 import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Comboitem;
+import org.zkoss.zul.Label;
 import org.zkoss.zul.Messagebox;
+import org.zkoss.zul.Row;
+import org.zkoss.zul.RowRenderer;
 
 /**
  * Controller for CRUD actions over a {@link Profile}
@@ -162,4 +167,23 @@ public class ProfileCRUDController extends BaseCRUDController<Profile> {
     protected void delete(Profile profile) throws InstanceNotFoundException {
         profileModel.confirmRemove(profile);
     }
+
+    public RowRenderer getRolesRenderer() {
+        return new RowRenderer() {
+            @Override
+            public void render(Row row, Object data) throws Exception {
+                final UserRole role = (UserRole) data;
+
+                row.appendChild(new Label(_(role.getDisplayName())));
+
+                row.appendChild(Util.createRemoveButton(new EventListener() {
+                    @Override
+                    public void onEvent(Event event) throws Exception {
+                        removeRole(role);
+                    }
+                }));
+            }
+        };
+    }
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java
index 140ab479c..53cfc1a42 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java
@@ -38,9 +38,15 @@ import org.libreplan.web.common.entrypoints.EntryPointsHandler;
 import org.libreplan.web.common.entrypoints.IURLHandlerRegistry;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.WrongValueException;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zul.Button;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.Constraint;
+import org.zkoss.zul.Label;
+import org.zkoss.zul.Row;
+import org.zkoss.zul.RowRenderer;
 import org.zkoss.zul.Textbox;
 
 /**
@@ -232,4 +238,25 @@ public class UserCRUDController extends BaseCRUDController<User> implements
         return (isLdapUser() && userModel.isLDAPRolesBeingUsed());
     }
 
+    public RowRenderer getRolesRenderer() {
+        return new RowRenderer() {
+            @Override
+            public void render(Row row, Object data) throws Exception {
+                final UserRole role = (UserRole) data;
+
+                row.appendChild(new Label(_(role.getDisplayName())));
+
+                Button removeButton = Util
+                        .createRemoveButton(new EventListener() {
+                    @Override
+                    public void onEvent(Event event) throws Exception {
+                        removeRole(role);
+                    }
+                });
+                removeButton.setDisabled(getLdapUserRolesLdapConfiguration());
+                row.appendChild(removeButton);
+            }
+        };
+    }
+
 }
diff --git a/libreplan-webapp/src/main/webapp/users/_editProfile.zul b/libreplan-webapp/src/main/webapp/users/_editProfile.zul
index f87bdfba5..bbabec218 100644
--- a/libreplan-webapp/src/main/webapp/users/_editProfile.zul
+++ b/libreplan-webapp/src/main/webapp/users/_editProfile.zul
@@ -54,23 +54,12 @@
                         <button label="${i18n:_('Add role')}"
                             onClick="controller.addSelectedRole()"/>
                     </hbox>
-                    <grid id="listing" model="@{controller.roles}">
+                    <grid id="listing" model="@{controller.roles}"
+                        rowRenderer="@{controller.rolesRenderer}">
                         <columns sizable="true">
                             <column label="${i18n:_('Role name')}" />
                             <column label="${i18n:_('Actions')}" />
                         </columns>
-                        <rows>
-                            <row self="@{each='role'}" value="@{role}">
-                                <label value="@{role.displayName}" />
-                                <hbox>
-                                    <button sclass="icono" image="/common/img/ico_borrar1.png"
-                                        hoverImage="/common/img/ico_borrar.png"
-                                        tooltiptext="${i18n:_('Delete')}"
-                                        onClick="controller.removeRole(self.parent.parent.value);">
-                                    </button>
-                                </hbox>
-                            </row>
-                        </rows>
                     </grid>
                 </groupbox>
             </tabpanel>
diff --git a/libreplan-webapp/src/main/webapp/users/_editUser.zul b/libreplan-webapp/src/main/webapp/users/_editUser.zul
index 69ffcbac1..3c6703395 100644
--- a/libreplan-webapp/src/main/webapp/users/_editUser.zul
+++ b/libreplan-webapp/src/main/webapp/users/_editUser.zul
@@ -101,23 +101,12 @@
                         <button label="${i18n:_('Add role')}"
                             onClick="controller.addSelectedRole()" disabled="@{controller.ldapUserRolesLdapConfiguration}"/>
                     </hbox>
-                    <grid id="listing" model="@{controller.roles}">
+                    <grid id="listing" model="@{controller.roles}"
+                        rowRenderer="@{controller.rolesRenderer}">
                         <columns sizable="true">
                             <column label="${i18n:_('Role name')}" />
                             <column label="${i18n:_('Actions')}" />
                         </columns>
-                        <rows>
-                            <row self="@{each='role'}" value="@{role}">
-                                <label value="@{role.displayName}" />
-                                <hbox>
-                                    <button sclass="icono" image="/common/img/ico_borrar1.png"
-                                        hoverImage="/common/img/ico_borrar.png"
-                                        tooltiptext="${i18n:_('Delete')}"
-                                        onClick="controller.removeRole(self.parent.parent.value);" disabled="@{controller.ldapUserRolesLdapConfiguration}">
-                                    </button>
-                                </hbox>
-                            </row>
-                        </rows>
                     </grid>
                     </groupbox>