Author: tchemit Date: 2011-11-08 15:08:22 +0100 (Tue, 08 Nov 2011) New Revision: 24 Url: http://forge.codelutin.com/repositories/revision/echobase/24 Log: add dbeditor Removed: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/DbEditorUtil.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EditActionEnum.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetTableDatas.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadTablePage.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/json/GetUsersAction.java trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml trunk/echobase-ui/src/main/resources/config/struts-json.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/decorators/layout-default.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userForm.jsp Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2011-11-08 14:07:37 UTC (rev 23) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2011-11-08 14:08:22 UTC (rev 24) @@ -25,6 +25,7 @@ import com.google.common.base.Supplier; import fr.ifremer.echobase.EchoBaseConfiguration; +import fr.ifremer.echobase.entities.meta.DbMeta; import org.nuiton.topia.TopiaContext; /** @@ -34,6 +35,7 @@ public class EchoBaseApplicationContext { protected EchoBaseConfiguration configuration; + protected DbMeta dbMeta; protected Supplier<TopiaContext> rootContextSupplier; @@ -52,4 +54,12 @@ public void setRootContextSupplier(Supplier<TopiaContext> rootContextSupplier) { this.rootContextSupplier = rootContextSupplier; } + + public DbMeta getDbMeta() { + return dbMeta; + } + + public void setDbMeta(DbMeta dbMeta) { + this.dbMeta = dbMeta; + } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2011-11-08 14:07:37 UTC (rev 23) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2011-11-08 14:08:22 UTC (rev 24) @@ -24,13 +24,16 @@ package fr.ifremer.echobase.ui; import com.google.common.base.Supplier; +import com.google.common.collect.Lists; import fr.ifremer.echobase.EchoBaseConfiguration; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.EchoBaseTopiaRootContextSupplierFactory; +import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserDTO; import fr.ifremer.echobase.entities.EchoBaseUserDTOImpl; import fr.ifremer.echobase.entities.EchoBaseUserImpl; +import fr.ifremer.echobase.entities.meta.DbMeta; import fr.ifremer.echobase.services.EchoBaseServiceContext; import fr.ifremer.echobase.services.EchoBaseServiceContextImpl; import fr.ifremer.echobase.services.EchoBaseServiceFactory; @@ -103,7 +106,13 @@ new EchoBaseTopiaRootContextSupplierFactory(); rootContextSupplier = factory.newDatabaseFromConfig(configuration); applicationContext.setRootContextSupplier(rootContextSupplier); + List<EchoBaseEntityEnum> entityEnums = + Lists.newArrayList(EchoBaseEntityEnum.values()); + entityEnums.remove(EchoBaseEntityEnum.EchoBaseUser); + DbMeta dbMeta = new DbMeta(entityEnums.toArray(new EchoBaseEntityEnum[entityEnums.size()])); + applicationContext.setDbMeta(dbMeta); + // register our not locale dependant converter Converter converter = ConverterUtil.getConverter(Float.class); if (converter != null) { @@ -119,7 +128,7 @@ updateSchema(configuration); } - createAdminUser(configuration); + createAdminUser(applicationContext); } catch (TopiaException e) { throw new EchoBaseTechnicalException("Could not init db", e); } @@ -179,22 +188,26 @@ } /** - * Creates the adminsitrator ({@code admin/admin}) on the internal - * database. + * Creates the adminsitrator ({@code admin/admin}) on the database. * - * @param configuration EchoBase configuration + * @param applicationContext application context * @throws TopiaException if could not create the user. */ - protected void createAdminUser(EchoBaseConfiguration configuration) throws TopiaException { + protected void createAdminUser(EchoBaseApplicationContext applicationContext) throws TopiaException { + EchoBaseConfiguration configuration = + applicationContext.getConfiguration(); + EchoBaseServiceFactory serviceFactory = new EchoBaseServiceFactory(); TopiaContext transaction = rootContextSupplier.get().beginTransaction(); try { EchoBaseServiceContext serviceContext = new EchoBaseServiceContextImpl( + Locale.getDefault(), transaction, configuration, + applicationContext.getDbMeta(), serviceFactory ); @@ -217,13 +230,6 @@ userDTO.setAdmin(true); service.createOrUpdate(userDTO); - for (int i = 0; i < 1000; i++) { - - userDTO.setEmail("admin" + i); - userDTO.setPassword("admin"); - userDTO.setAdmin(true); - service.createOrUpdate(userDTO); - } } } finally { transaction.closeContext(); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java 2011-11-08 14:07:37 UTC (rev 23) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java 2011-11-08 14:08:22 UTC (rev 24) @@ -122,11 +122,18 @@ /** * Fabrique pour récupérer le ServiceContext tel qu'il devrait être fourni * à la fabrication d'un service. + * + * @return service context */ protected EchoBaseServiceContext getServiceContext() { if (serviceContext == null) { serviceContext = new EchoBaseServiceContextImpl( - getTransaction(), getConfiguration(), serviceFactory); + getLocale(), + getTransaction(), + getConfiguration(), + getEchoBaseApplicationContext().getDbMeta(), + serviceFactory + ); } return serviceContext; } Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EditActionEnum.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/DbEditorUtil.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/DbEditorUtil.java 2011-11-08 14:07:37 UTC (rev 23) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/DbEditorUtil.java 2011-11-08 14:08:22 UTC (rev 24) @@ -1,67 +0,0 @@ -package fr.ifremer.echobase.ui.actions.dbeditor; - -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import fr.ifremer.echobase.entities.EchoBaseDAOHelper; -import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.entities.ExportQuery; -import fr.ifremer.echobase.services.DbEditorService; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.persistence.TopiaEntity; - -import java.beans.Introspector; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import static org.nuiton.i18n.I18n._; - -/** - * Helper for the db editor. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.1 - */ -public class DbEditorUtil { - - protected static Map<String, String> tableNames; - - public static Map<String, String> getTableNames() { - - if (tableNames == null) { - tableNames = Maps.newTreeMap(); - Class<? extends TopiaEntity>[] contractClasses = - EchoBaseDAOHelper.getContractClasses(); - for (Class<? extends TopiaEntity> contractClass : contractClasses) { - tableNames.put(contractClass.getName(), _("echobase.common." + Introspector.decapitalize(contractClass.getSimpleName()))); - } - } - return tableNames; - } - - public static List<DbEditorService.TableMeta> getTableMeta(String tableName, TopiaContext transaction) { - - List<DbEditorService.TableMeta> result = Lists.newLinkedList(); - if (EchoBaseUser.class.getName().equals(tableName)) { -// result.add(newMeta(EchoBaseUser.TOPIA_ID, String.class)); - result.add(DbEditorService.newMeta(EchoBaseUser.PROPERTY_EMAIL, String.class)); - result.add(DbEditorService.newMeta(EchoBaseUser.PROPERTY_ADMIN, boolean.class)); - } - - if (ExportQuery.class.getName().equals(tableName)) { - -// result.add(newMeta(ExportQuery.TOPIA_ID, String.class)); - result.add(DbEditorService.newMeta(ExportQuery.PROPERTY_NAME, String.class)); - result.add(DbEditorService.newMeta(ExportQuery.PROPERTY_DESCRIPTION, String.class)); - result.add(DbEditorService.newMeta(ExportQuery.PROPERTY_SQL_QUERY, String.class)); - result.add(DbEditorService.newMeta(ExportQuery.PROPERTY_LAST_MODIFIED_DATE, Date.class)); - result.add(DbEditorService.newMeta(ExportQuery.PROPERTY_LAST_MODIFIED_USER, EchoBaseUser.class)); - } - return result; - } - - protected DbEditorUtil() { - // helper classes, avoid constructor - } - -} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetTableDatas.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetTableDatas.java 2011-11-08 14:07:37 UTC (rev 23) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetTableDatas.java 2011-11-08 14:08:22 UTC (rev 24) @@ -1,10 +1,32 @@ +/* + * #%L + * EchoBase :: UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.echobase.ui.actions.dbeditor; -import com.google.common.collect.Lists; import fr.ifremer.echobase.services.DbEditorService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; -import java.util.List; +import java.util.Map; /** * To obtain the data for the given request. @@ -19,17 +41,21 @@ /** Name of the table to load. */ protected String tableName; - /** Metas of the table */ - protected List<DbEditorService.TableMeta> tableMetas; + /** Datas of the given table. */ + protected Map[] datas; + public Map[] getDatas() { + return datas; + } + public void setTableName(String tableName) { this.tableName = tableName; } @Override public String execute() throws Exception { - tableMetas = Lists.newLinkedList(); - tableMetas.addAll(DbEditorUtil.getTableMeta(tableName)); + DbEditorService dbEditorService = newService(DbEditorService.class); + datas = dbEditorService.getDatas(tableName); return SUCCESS; } Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetTableDatas.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadTablePage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadTablePage.java 2011-11-08 14:07:37 UTC (rev 23) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadTablePage.java 2011-11-08 14:08:22 UTC (rev 24) @@ -1,23 +1,42 @@ +/* + * #%L + * EchoBase :: UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.echobase.ui.actions.dbeditor; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.meta.ColumnMeta; +import fr.ifremer.echobase.entities.meta.DbMeta; +import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.services.DbEditorService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.lang.StringUtils; -import org.hibernate.cfg.Configuration; -import org.hibernate.mapping.Column; -import org.hibernate.mapping.PersistentClass; -import org.hibernate.mapping.Table; -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.persistence.TopiaEntity; -import java.util.Iterator; import java.util.List; import java.util.Map; +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.l_; + /** * To load the db editor page.s * @@ -35,7 +54,7 @@ protected Map<String, String> tableNames; /** Metas of the table */ - protected List<DbEditorService.TableMeta> tableMetas; + protected TableMeta tableMeta; public String getTableName() { return tableName; @@ -45,8 +64,8 @@ return tableNames; } - public List<DbEditorService.TableMeta> getTableMetas() { - return tableMetas; + public List<ColumnMeta> getColumnMetas() { + return tableMeta.getColumns(); } public void setTableName(String tableName) { @@ -56,28 +75,21 @@ @Override public String input() throws Exception { tableNames = Maps.newTreeMap(); - tableNames.putAll(DbEditorUtil.getTableNames()); - if (StringUtils.isNotEmpty(tableName)) { + DbMeta dbMeta = getEchoBaseApplicationContext().getDbMeta(); + for (TableMeta tableMeta : dbMeta) { + String name = tableMeta.getName(); + String i18nKey = tableMeta.getI18nKey(); + tableNames.put(name, l_(getLocale(), i18nKey)); + } + if (StringUtils.isEmpty(tableName)) { - // load also table metas - EchoBaseEntityEnum entityEnum = EchoBaseEntityEnum.valueOf(tableName); - Preconditions.checkNotNull(entityEnum); - String implementationFQN = entityEnum.getImplementationFQN(); - TopiaContextImplementor tx = (TopiaContextImplementor) getTransaction(); - Configuration hibernateConfiguration = tx.getHibernateConfiguration(); - PersistentClass classMapping = hibernateConfiguration.getClassMapping(implementationFQN); - Table table = classMapping.getTable(); - Iterator<?> columnIterator = table.getColumnIterator(); - while (columnIterator.hasNext()) { - Column column = (Column) columnIterator.next(); - String name = column.getName(); - if (TopiaEntity.TOPIA_CREATE_DATE.equals(name)) { + // no table selected + addActionMessage(_("echobase.info.no.table.selected")); + } else { - // skip it - } - } - tableMetas = Lists.newLinkedList(); - tableMetas.addAll(DbEditorUtil.getTableMeta(tableName, getTransaction())); + // load table metas + DbEditorService dbEditorService = newService(DbEditorService.class); + tableMeta = dbEditorService.getTableMetas(tableName); } return INPUT; } Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadTablePage.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/json/GetUsersAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2011-11-08 14:07:37 UTC (rev 23) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2011-11-08 14:08:22 UTC (rev 24) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> + <!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" "http://struts.apache.org/dtds/struts-2.1.7.dtd"> Property changes on: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-ui/src/main/resources/config/struts-json.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-08 14:07:37 UTC (rev 23) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-08 14:08:22 UTC (rev 24) @@ -9,6 +9,7 @@ echobase.common.email=Email echobase.common.password=Mot de passe echobase.common.save=Sauvegarder +echobase.common.tableName=Nom de la table echobase.common.user=Utilisateur echobase.error.bad.password=Mot de passe incorrrect echobase.error.email.already.used= @@ -18,6 +19,7 @@ echobase.export.queryDescription=Description echobase.export.queryName=Nom echobase.export.querySql=SQL +echobase.info.no.table.selected=Aucune table sélectionnée echobase.label.admin.user.create=Création d'un utilisateur echobase.label.admin.user.delete=Suppression d'un utilisateur echobase.label.admin.user.edit=Edition d'un utilisateur Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2011-11-08 14:07:37 UTC (rev 23) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2011-11-08 14:08:22 UTC (rev 24) @@ -41,18 +41,18 @@ <div id="body"> - <%-- TODO sletellier 20111104 : add this --%> - <%--<s:if test="hasActionMessages()">--%> - <%--<div class="info_success">--%> - <%--<s:actionmessage/>--%> - <%--</div>--%> - <%--</s:if>--%> + <%-- TODO sletellier 20111104 : add this --%> + <s:if test="hasActionMessages()"> + <div class="info_success"> + <s:actionmessage/> + </div> + </s:if> - <%--<s:if test="hasActionErrors()">--%> - <%--<div class="info_error">--%> - <%--<s:actionerror/>--%> - <%--</div>--%> - <%--</s:if>--%> + <s:if test="hasActionErrors()"> + <div class="info_error"> + <s:actionerror/> + </div> + </s:if> <d:body/> </div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-08 14:07:37 UTC (rev 23) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-08 14:08:22 UTC (rev 24) @@ -2,8 +2,8 @@ #%L EchoBase :: UI - $Id: export.jsp 17 2011-11-07 10:57:50Z tchemit $ - $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/webap... $ + $Id$ + $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -43,19 +43,14 @@ </script> <div> -<s:select key="tableName" href='%{getTableNamesUrl}' - label='%{getText("echobase.common.tableName")}' + <s:select key="tableName" href='%{getTableNamesUrl}' + label='%{getText("echobase.common.tableName")}' + list="tableNames" headerKey="" headerValue=""/> - list="tableNames" headerKey="" headerValue=""/> - - </div> +</div> <br/> -<s:if test="tableName == ''"> - <p>Aucune table sélectionnée</p> -</s:if> -<s:else> - +<s:if test="tableName!=null and tableName != ''"> <s:url id="loadUrl" action="getTableDatas" namespace="/dbeditor" escapeAmp="false"> <s:param name="tableName" value="%{tableName}"/> @@ -63,7 +58,7 @@ <sjg:grid id="tableDatas" caption="%{getText('echobase.common.tableDatas', tableNames[tableName])}" - dataType="json" href="%{loadUrl}" gridModel="trips" + dataType="json" href="%{loadUrl}" gridModel="datas" pager="true" pagerButtons="false" pagerInput="false" navigator="true" autowidth="true" rownumbers="false" navigatorEdit="true" @@ -75,9 +70,9 @@ <sjg:gridColumn name="id" title="id" hidden="true"/> - <s:iterator value="tableMetas" var="meta" status="status"> + <s:iterator value="columnMetas" var="meta" status="status"> - <sjg:gridColumn name="%{#meta.name}" title="%{#meta.label}" + <sjg:gridColumn name="%{#meta.name}" title="%{getText(#meta.i18nKey)}" edittype="%{#meta.columnType}" sortable="false" editable="true"/> @@ -85,5 +80,5 @@ </sjg:grid> -</s:else> +</s:if> Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userForm.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native