[Simexplorer-si-commits] r1061 - in trunk/simexplorer-is/simexplorer-is-web/src: java/fr/cemagref/simexplorer/is/ui/web/components java/fr/cemagref/simexplorer/is/ui/web/pages java/fr/cemagref/simexplorer/is/ui/web/tools main/webapp main/webapp/WEB-INF resources/fr/cemagref/simexplorer/is/ui/web/components

Author: glandais Date: 2008-02-18 13:16:21 +0000 (Mon, 18 Feb 2008) New Revision: 1061 Added: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/SimGrid.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java trunk/simexplorer-is/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/SimGrid.tml Removed: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/MetaDataModelFactory.java Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementDelete.tml trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementList.tml trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementMetadata.tml trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/GroupList.tml trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/UserEdit.tml trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/UserList.tml trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties Log: SimGrid instead of Grid (no data message) Factoring of Tapestry model building Elements owned on UserEdit page Added: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/SimGrid.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/SimGrid.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/SimGrid.java 2008-02-18 13:16:21 UTC (rev 1061) @@ -0,0 +1,29 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.ui.web.components; + +import org.apache.tapestry.corelib.components.Grid; + +/** + * The Class SimGrid. + */ +public class SimGrid extends Grid { + + // duplicate + +} Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java 2008-02-18 13:16:19 UTC (rev 1060) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java 2008-02-18 13:16:21 UTC (rev 1061) @@ -33,7 +33,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; -import fr.cemagref.simexplorer.is.ui.web.tools.MetaDataModelFactory; +import fr.cemagref.simexplorer.is.ui.web.tools.ModelFactory; /** * The Class ElementDelete. @@ -68,7 +68,7 @@ * Page loaded. */ void pageLoaded() { - model = MetaDataModelFactory.getMetaDataModel(beanModelSource, resources, false); + model = ModelFactory.getMetaDataModel(beanModelSource, resources, false); } /* (non-Javadoc) Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-02-18 13:16:19 UTC (rev 1060) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-02-18 13:16:21 UTC (rev 1061) @@ -32,7 +32,7 @@ import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.ui.web.grid.ElementDataSource; import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; -import fr.cemagref.simexplorer.is.ui.web.tools.MetaDataModelFactory; +import fr.cemagref.simexplorer.is.ui.web.tools.ModelFactory; /** * The Class ElementList. @@ -67,7 +67,7 @@ * Page loaded. */ void pageLoaded() { - model = MetaDataModelFactory.getMetaDataModel(beanModelSource, resources, true); + model = ModelFactory.getMetaDataModel(beanModelSource, resources, true); elementDataSource = new ElementDataSource(getToken()); } Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java 2008-02-18 13:16:19 UTC (rev 1060) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementMetadata.java 2008-02-18 13:16:21 UTC (rev 1061) @@ -27,7 +27,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; -import fr.cemagref.simexplorer.is.ui.web.tools.MetaDataModelFactory; +import fr.cemagref.simexplorer.is.ui.web.tools.ModelFactory; /** * The Class ElementMetadata. @@ -62,7 +62,7 @@ * Page loaded. */ void pageLoaded() { - model = MetaDataModelFactory.getMetaDataModel(beanModelSource, resources, false); + model = ModelFactory.getMetaDataModel(beanModelSource, resources, false); } /** Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-02-18 13:16:19 UTC (rev 1060) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-02-18 13:16:21 UTC (rev 1061) @@ -32,6 +32,7 @@ import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.ui.web.pages.security.AdminPage; import fr.cemagref.simexplorer.is.ui.web.services.RemoteSecurityService; +import fr.cemagref.simexplorer.is.ui.web.tools.ModelFactory; /** * The Class GroupList. @@ -71,17 +72,7 @@ * Page loaded. */ void pageLoaded() { - model = beanModelSource.create(Group.class, true, resources); - List<String> wantedProperties = new ArrayList<String>(); - wantedProperties.add("name"); - List<String> properties = model.getPropertyNames(); - for (String property : properties) { - if (!wantedProperties.contains(property)) { - model = model.remove(property); - } - } - model.add("edit", null); - model.add("delete", null); + model = ModelFactory.getGroupModel(beanModelSource, resources, true, true); } /** Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-02-18 13:16:19 UTC (rev 1060) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-02-18 13:16:21 UTC (rev 1061) @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.StringTokenizer; import org.apache.tapestry.ComponentResources; import org.apache.tapestry.ValueEncoder; @@ -31,12 +32,15 @@ import org.apache.tapestry.services.BeanModelSource; import de.hsofttec.t5components.annotations.SetterGetter; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.security.entities.User; import fr.cemagref.simexplorer.is.ui.web.pages.security.AdminPage; import fr.cemagref.simexplorer.is.ui.web.services.GroupValueEncoder; import fr.cemagref.simexplorer.is.ui.web.services.RemoteSecurityService; +import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; +import fr.cemagref.simexplorer.is.ui.web.tools.ModelFactory; /** * The Class UserEdit. @@ -59,11 +63,11 @@ @Persist private GroupValueEncoder groupEncoder; - /** The group model. */ + /** The group metadataModel. */ @Retain private BeanModel groupModel; - /** The bean model source. */ + /** The bean metadataModel source. */ @Inject private BeanModelSource beanModelSource; @@ -76,6 +80,18 @@ @SetterGetter private Group _group; + /** The metadataModel. */ + @Retain + private BeanModel metadataModel; + + /** The _element. */ + @SetterGetter + private MetaData _element; + + /** The element detail. */ + @InjectPage + private ElementDetail elementDetail; + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.ui.web.pages.security.ProtectedPage#getWindowTitle() */ @@ -88,22 +104,16 @@ * Page loaded. */ void pageLoaded() { - groupModel = beanModelSource.create(Group.class, true, resources); - List<String> wantedProperties = new ArrayList<String>(); - wantedProperties.add("name"); - List<String> properties = groupModel.getPropertyNames(); - for (String property : properties) { - if (!wantedProperties.contains(property)) { - groupModel = groupModel.remove(property); - } - } + groupModel = ModelFactory.getGroupModel(beanModelSource, resources, false, false); + metadataModel = ModelFactory.getMetaDataModel(beanModelSource, resources, false); } /** * Sets the up. * * @param userId the new up - * @throws SimExplorerException + * + * @throws SimExplorerException the sim explorer exception */ void setup(int userId) throws SimExplorerException { this.groupsOfUser = new ArrayList<Group>(); @@ -122,7 +132,8 @@ * On success. * * @return the object - * @throws SimExplorerException + * + * @throws SimExplorerException the sim explorer exception */ public Object onSuccess() throws SimExplorerException { if (user.getId() == null) { @@ -145,7 +156,8 @@ * Gets the groups. * * @return the groups - * @throws SimExplorerException + * + * @throws SimExplorerException the sim explorer exception */ public List<Group> getGroups() throws SimExplorerException { Group[] groups; @@ -159,7 +171,8 @@ * Gets the owned groups. * * @return the owned groups - * @throws SimExplorerException + * + * @throws SimExplorerException the sim explorer exception */ public Group[] getOwnedGroups() throws SimExplorerException { if (user.getId() == null) { @@ -169,6 +182,29 @@ } /** + * Gets the elements owned by. + * + * @return the elements owned by + * + * @throws SimExplorerException the sim explorer exception + */ + public List<MetaData> getElementsOwnedBy() throws SimExplorerException { + List<MetaData> metadatas = new ArrayList<MetaData>(); + + String[] elementsOwnedBy = RemoteSecurityService.getAuthentificationService().getElementsOwnedBy(getToken(), + user); + + for (int i = 0; i < elementsOwnedBy.length; i++) { + MetaData metadata = RemoteStorageService.getStorageService().getMetadata(getToken(), elementsOwnedBy[i]); + if (metadata != null) { + metadatas.add(metadata); + } + } + + return metadatas; + } + + /** * Gets the group encoder. * * @return the group encoder @@ -199,7 +235,8 @@ * On action from reset password. * * @return the object - * @throws SimExplorerException + * + * @throws SimExplorerException the sim explorer exception */ public Object onActionFromResetPassword() throws SimExplorerException { RemoteSecurityService.getAuthentificationService().resetPassword(getToken(), user.getLogin()); @@ -252,12 +289,47 @@ } /** - * Gets the group model. + * Gets the group metadataModel. * - * @return the group model + * @return the group metadataModel */ public BeanModel getGroupModel() { return groupModel; } + /** + * Gets the metadataModel. + * + * @return the metadataModel + */ + public BeanModel getMetadataModel() { + return metadataModel; + } + + /** + * Gets the detail element context. + * + * @return the detail element context + */ + public String getDetailElementContext() { + return _element.getUuid() + "," + _element.getVersion(); + } + + /** + * On action from detail element using. + * + * @param context the context + * + * @return the object + * + * @throws SimExplorerException the sim explorer exception + */ + public Object onActionFromDetailElement(String context) throws SimExplorerException { + StringTokenizer st = new StringTokenizer(context, ","); + String uuid = st.nextToken(); + String version = st.nextToken(); + elementDetail.setup(uuid, version); + return elementDetail; + } + } Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-02-18 13:16:19 UTC (rev 1060) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-02-18 13:16:21 UTC (rev 1061) @@ -32,6 +32,7 @@ import fr.cemagref.simexplorer.is.security.entities.User; import fr.cemagref.simexplorer.is.ui.web.pages.security.AdminPage; import fr.cemagref.simexplorer.is.ui.web.services.RemoteSecurityService; +import fr.cemagref.simexplorer.is.ui.web.tools.ModelFactory; /** * The Class UserList. @@ -71,28 +72,14 @@ * Page loaded. */ void pageLoaded() { - model = beanModelSource.create(User.class, true, resources); - List<String> wantedProperties = new ArrayList<String>(); - wantedProperties.add("login"); - wantedProperties.add("name"); - wantedProperties.add("admin"); - wantedProperties.add("superAdmin"); - - List<String> properties = model.getPropertyNames(); - for (String property : properties) { - if (!wantedProperties.contains(property)) { - model = model.remove(property); - } - } - model.add("edit", null); - model.add("delete", null); + model = ModelFactory.getUserModel(beanModelSource, resources, true, true); } /** * Gets the users. * * @return the users - * @throws SimExplorerException + * @throws SimExplorerException */ public User[] getUsers() throws SimExplorerException { User[] users = RemoteSecurityService.getAuthentificationService().getUsers(getToken()); @@ -105,7 +92,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ public Object onActionFromDelete(Integer context) throws SimExplorerException { RemoteSecurityService.getAuthentificationService().deleteUser(getToken(), context); @@ -118,7 +105,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ public Object onActionFromEdit(Integer context) throws SimExplorerException { userEdit.setup(context); Deleted: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/MetaDataModelFactory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/MetaDataModelFactory.java 2008-02-18 13:16:19 UTC (rev 1060) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/MetaDataModelFactory.java 2008-02-18 13:16:21 UTC (rev 1061) @@ -1,74 +0,0 @@ -/* -* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package fr.cemagref.simexplorer.is.ui.web.tools; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.tapestry.ComponentResources; -import org.apache.tapestry.beaneditor.BeanModel; -import org.apache.tapestry.services.BeanModelSource; - -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; - -/** - * A factory for creating MetaDataModel objects. - */ -public class MetaDataModelFactory { - - /** - * Instantiates a new meta data model factory. - */ - protected MetaDataModelFactory() { - // ssssh - } - - /** - * Gets the meta data model. - * - * @param beanModelSource the bean model source - * @param resources the resources - * @param dateSortable the date sortable - * - * @return the meta data model - */ - public static BeanModel getMetaDataModel(BeanModelSource beanModelSource, ComponentResources resources, - boolean dateSortable) { - BeanModel model = beanModelSource.create(MetaData.class, false, resources); - List<String> wantedProperties = new ArrayList<String>(); - wantedProperties.add("type"); - wantedProperties.add("uuid"); - wantedProperties.add("name"); - wantedProperties.add("description"); - wantedProperties.add("version"); - wantedProperties.add("creationDate"); - List<String> properties = model.getPropertyNames(); - for (String property : properties) { - if (!dateSortable || !property.equals("creationDate")) { - model.get(property).sortable(false); - } else { - model.get(property).sortable(true); - } - if (!wantedProperties.contains(property)) { - model = model.remove(property); - } - } - return model; - } - -} Copied: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java (from rev 1043, trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/MetaDataModelFactory.java) =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java 2008-02-18 13:16:21 UTC (rev 1061) @@ -0,0 +1,140 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.ui.web.tools; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.tapestry.ComponentResources; +import org.apache.tapestry.beaneditor.BeanModel; +import org.apache.tapestry.services.BeanModelSource; + +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.security.entities.Group; +import fr.cemagref.simexplorer.is.security.entities.User; + +/** + * A factory for creating MetaDataModel objects. + */ +public class ModelFactory { + + /** + * Instantiates a new meta data model factory. + */ + protected ModelFactory() { + // ssssh + } + + /** + * Gets the meta data model. + * + * @param beanModelSource the bean model source + * @param resources the resources + * @param dateSortable the date sortable + * + * @return the meta data model + */ + public static BeanModel getMetaDataModel(BeanModelSource beanModelSource, ComponentResources resources, + boolean dateSortable) { + BeanModel model = beanModelSource.create(MetaData.class, false, resources); + List<String> wantedProperties = new ArrayList<String>(); + wantedProperties.add("type"); + wantedProperties.add("uuid"); + wantedProperties.add("name"); + wantedProperties.add("description"); + wantedProperties.add("version"); + wantedProperties.add("creationDate"); + List<String> properties = model.getPropertyNames(); + for (String property : properties) { + if (!dateSortable || !property.equals("creationDate")) { + model.get(property).sortable(false); + } else { + model.get(property).sortable(true); + } + if (!wantedProperties.contains(property)) { + model = model.remove(property); + } + } + return model; + } + + /** + * Gets the group model. + * + * @param beanModelSource the bean model source + * @param resources the resources + * @param edit the edit + * @param delete the delete + * + * @return the group model + */ + public static BeanModel getGroupModel(BeanModelSource beanModelSource, ComponentResources resources, boolean edit, + boolean delete) { + BeanModel model = beanModelSource.create(Group.class, true, resources); + List<String> wantedProperties = new ArrayList<String>(); + wantedProperties.add("name"); + List<String> properties = model.getPropertyNames(); + for (String property : properties) { + if (!wantedProperties.contains(property)) { + model = model.remove(property); + } + } + if (edit) { + model.add("edit", null); + } + if (delete) { + model.add("delete", null); + } + return model; + } + + /** + * Gets the user model. + * + * @param beanModelSource the bean model source + * @param resources the resources + * @param edit the edit + * @param delete the delete + * + * @return the user model + */ + public static BeanModel getUserModel(BeanModelSource beanModelSource, ComponentResources resources, boolean edit, + boolean delete) { + BeanModel model = beanModelSource.create(User.class, true, resources); + List<String> wantedProperties = new ArrayList<String>(); + wantedProperties.add("login"); + wantedProperties.add("name"); + wantedProperties.add("admin"); + wantedProperties.add("superAdmin"); + + List<String> properties = model.getPropertyNames(); + for (String property : properties) { + if (!wantedProperties.contains(property)) { + model = model.remove(property); + } + } + if (edit) { + model.add("edit", null); + } + if (delete) { + model.add("delete", null); + } + return model; + } + +} Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementDelete.tml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementDelete.tml 2008-02-18 13:16:19 UTC (rev 1060) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementDelete.tml 2008-02-18 13:16:21 UTC (rev 1061) @@ -10,7 +10,7 @@ <t:parameter name="else"> {message:simexplorer.ui.web.delete.deleteimpossible} - <table t:type="Grid" source="usedBy" row="listMetadata" model="model"> + <table t:type="SimGrid" source="usedBy" row="listMetadata" model="model"> <t:parameter name="uuidCell"> <t:actionlink t:id="detailElementUsedBy" context="${detailElementContext}">${message:simexplorer.ui.web.elementlist.details}</t:actionlink> @@ -33,7 +33,7 @@ <t:parameter name="else"> {message:simexplorer.ui.web.delete.deleteimpossibleAll} - <table t:type="Grid" source="allUsedByList" row="listMetadata" + <table t:type="SimGrid" source="allUsedByList" row="listMetadata" model="model"> <t:parameter name="uuidCell"> <t:actionlink t:id="detailElementUsedByAnyVersion" Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementList.tml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementList.tml 2008-02-18 13:16:19 UTC (rev 1060) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementList.tml 2008-02-18 13:16:21 UTC (rev 1061) @@ -3,7 +3,7 @@ <h1 class="Title">${windowtitle}</h1> - <table t:type="Grid" source="elements" row="element" model="model"> + <table t:type="SimGrid" source="elements" row="element" model="model"> <t:parameter name="uuidCell"> <t:actionlink t:id="detailElement" context="${detailElementContext}">${message:simexplorer.ui.web.elementlist.details}</t:actionlink> </t:parameter> Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementMetadata.tml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementMetadata.tml 2008-02-18 13:16:19 UTC (rev 1060) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementMetadata.tml 2008-02-18 13:16:21 UTC (rev 1061) @@ -13,7 +13,7 @@ <h2>${message:simexplorer.ui.web.metadata.using}</h2> </p> - <table t:type="Grid" source="elementsUsing" row="element" model="model"> + <table t:type="SimGrid" source="elementsUsing" row="element" model="model"> <t:parameter name="uuidCell"> <t:actionlink t:id="detailElementUsed" context="${detailElementContext}">${message:simexplorer.ui.web.elementlist.details}</t:actionlink> @@ -25,7 +25,7 @@ </p> - <table t:type="Grid" source="elementsUsedBy" row="element" model="model"> + <table t:type="SimGrid" source="elementsUsedBy" row="element" model="model"> <t:parameter name="uuidCell"> <t:actionlink t:id="detailElementUsing" context="${detailElementContext}">${message:simexplorer.ui.web.elementlist.details}</t:actionlink> Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/GroupList.tml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/GroupList.tml 2008-02-18 13:16:19 UTC (rev 1060) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/GroupList.tml 2008-02-18 13:16:21 UTC (rev 1061) @@ -2,7 +2,7 @@ title="${windowtitle}"> <p> - <table t:type="Grid" source="groups" row="group" model="model"> + <table t:type="SimGrid" source="groups" row="group" model="model"> <t:parameter name="editCell"> <t:actionlink t:id="edit" context="group.id">${message:simexplorer.ui.web.modify}</t:actionlink> </t:parameter> Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/UserEdit.tml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/UserEdit.tml 2008-02-18 13:16:19 UTC (rev 1060) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/UserEdit.tml 2008-02-18 13:16:21 UTC (rev 1061) @@ -30,12 +30,10 @@ t:type="Palette" model="groups" selected="groupsOfUser" encoder="groupEncoder" /></p> - <p>${message:simexplorer.ui.web.ownerOf} : - <table t:type="Grid" source="ownedGroups" row="group" + <p>${message:simexplorer.ui.web.ownerOfGroups} :</p> + <p> + <table t:type="SimGrid" source="ownedGroups" row="group" model="groupModel"> - <t:parameter name="empty"> - ${message:simexplorer.ui.web.none} - </t:parameter> </table> </p> @@ -43,6 +41,18 @@ <input t:type="Submit" t:value="${message:simexplorer.ui.web.submit}" /> <a t:type="actionlink" t:id="cancel">${message:simexplorer.ui.web.cancel}</a> + + <t:if test="creating" negate="true"> + <p>${message:simexplorer.ui.web.ownerOfElements} :</p> + <table t:type="SimGrid" source="elementsOwnedBy" row="element" + model="metadataModel"> + <t:parameter name="uuidCell"> + <t:actionlink t:id="detailElement" + context="${detailElementContext}">${message:simexplorer.ui.web.elementlist.details}</t:actionlink> + </t:parameter> + </table> + </t:if> + </t:form> </t:layout> Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/UserList.tml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/UserList.tml 2008-02-18 13:16:19 UTC (rev 1060) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/UserList.tml 2008-02-18 13:16:21 UTC (rev 1061) @@ -2,7 +2,7 @@ title="${windowtitle}"> - <table t:type="Grid" source="users" row="user" model="model"> + <table t:type="SimGrid" source="users" row="user" model="model"> <t:parameter name="editCell"> <t:actionlink t:id="edit" context="user.id">${message:simexplorer.ui.web.modify}</t:actionlink> </t:parameter> Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-18 13:16:19 UTC (rev 1060) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-18 13:16:21 UTC (rev 1061) @@ -95,6 +95,8 @@ simexplorer.ui.web.ownerOf=Owner of simexplorer.ui.web.none=None simexplorer.ui.web.resetPassword=Reset password +simexplorer.ui.web.ownerOfGroups=Owner of groups +simexplorer.ui.web.ownerOfElements=Owner of elements simexplorer.ui.web.delete.confirmdelete=Confirm deletion of element simexplorer.ui.web.delete.confirmdeleteAll=Confirm deletion of element in all versions Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-02-18 13:16:19 UTC (rev 1060) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-02-18 13:16:21 UTC (rev 1061) @@ -92,9 +92,11 @@ simexplorer.ui.web.groupMembers=Groupes membres simexplorer.ui.web.memberOf=Membre de -simexplorer.ui.web.ownerOf=Propriétaire des groupes +simexplorer.ui.web.ownerOf=Propriétaire de simexplorer.ui.web.none=Aucun simexplorer.ui.web.resetPassword=Réinitialiser le mot de passe +simexplorer.ui.web.ownerOfGroups=Propriétaire des groupes +simexplorer.ui.web.ownerOfElements=Propriétaire des éléments simexplorer.ui.web.delete.confirmdelete=Confirmer la suppression de l'élément simexplorer.ui.web.delete.confirmdeleteAll=Confirmer la suppression de l'élément dans toutes ses versions Added: trunk/simexplorer-is/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/SimGrid.tml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/SimGrid.tml (rev 0) +++ trunk/simexplorer-is/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/SimGrid.tml 2008-02-18 13:16:21 UTC (rev 1061) @@ -0,0 +1,20 @@ +<div class="t-data-grid" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"> + + <div t:id="pagerTop"/> + + <table class="t-data-grid"> + <thead t:id="columns"/> + <tbody> + <tr t:id="rows"/> + </tbody> + </table> + + <div t:id="pagerBottom"/> + + <t:block> + <div t:id="pager"/> + </t:block> + + <t:block id="empty"> ${message:simexplorer.ui.web.none} </t:block> + +</div>