Author: tchemit Date: 2011-12-05 09:27:35 +0100 (Mon, 05 Dec 2011) New Revision: 143 Url: http://forge.codelutin.com/repositories/revision/echobase/143 Log: -fix grid sort (no more prefix) -no i18n on columns in dbeditor (neither in table names) -impact from dbeditor Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/GetSqlResult.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/GetUsers.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSql.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp trunk/echobase-ui/src/site/rst/index.rst 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-12-05 08:24:55 UTC (rev 142) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2011-12-05 08:27:35 UTC (rev 143) @@ -107,7 +107,7 @@ List<EchoBaseEntityEnum> entityEnums = Lists.newArrayList(EchoBaseEntityEnum.values()); // entityEnums.remove(EchoBaseEntityEnum.EchoBaseUser); - DbMeta dbMeta = new DbMeta(entityEnums.toArray(new EchoBaseEntityEnum[entityEnums.size()])); + DbMeta dbMeta = DbMeta.newDbMeta(entityEnums); applicationContext.setDbMeta(dbMeta); @@ -122,7 +122,7 @@ try { boolean schemaExist = isSchemaCreated(); if (!schemaExist || - configuration.getOptionAsBoolean(EchoBaseConfiguration.OPTION_UPDATE_SCHEMA)) { + configuration.getOptionAsBoolean(EchoBaseConfiguration.OPTION_UPDATE_SCHEMA)) { updateSchema(configuration); } @@ -220,7 +220,7 @@ // no users in database create the admin user if (log.isInfoEnabled()) { log.info("No user in database, will create default " + - "admin user (password admin)."); + "admin user (password admin)."); } service.createDefaultAdminUser(); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java 2011-12-05 08:24:55 UTC (rev 142) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java 2011-12-05 08:27:35 UTC (rev 143) @@ -56,13 +56,6 @@ protected String filters; - /** Prefix added to the sidx when used. */ - protected final String sidx_prefix; - - protected AbstractJSONPaginedAction(String sidx_prefix) { - this.sidx_prefix = sidx_prefix; - } - public void setRows(Integer rows) { pager.setPageSize(rows); } @@ -98,7 +91,7 @@ protected String getSortColumn() { String result = null; if (useSort()) { - result = sidx.substring(sidx_prefix.length()); + result = sidx; } return result; } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java 2011-12-05 08:24:55 UTC (rev 142) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java 2011-12-05 08:27:35 UTC (rev 143) @@ -75,8 +75,7 @@ DbMeta dbMeta = getEchoBaseApplicationContext().getDbMeta(); for (TableMeta tableMeta : dbMeta) { String name = tableMeta.getName(); - String i18nKey = tableMeta.getI18nKey(); - entityTypes.put(name, _(i18nKey)); + entityTypes.put(name, name); } if (entityType == null) { @@ -86,7 +85,7 @@ // load table metas DbEditorService dbEditorService = newService(DbEditorService.class); - tableMeta = dbEditorService.getTableMetas(entityType); + tableMeta = dbEditorService.getTableMeta(entityType); } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2011-12-05 08:24:55 UTC (rev 142) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2011-12-05 08:27:35 UTC (rev 143) @@ -50,10 +50,6 @@ /** Datas of the given table. */ protected Map<?, ?>[] datas; - public GetEntities() { - super("datas_"); - } - public void setEntityType(EchoBaseEntityEnum entityType) { this.entityType = entityType; } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2011-12-05 08:24:55 UTC (rev 142) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2011-12-05 08:27:35 UTC (rev 143) @@ -23,8 +23,6 @@ */ package fr.ifremer.echobase.ui.actions.dbeditor; -import fr.ifremer.echobase.entities.meta.ColumnMeta; - /** * To load the db editor pages. * @@ -51,14 +49,4 @@ } return INPUT; } - - public String getFormatter(ColumnMeta meta) { - String editType = "'string'"; - if (meta.isBoolean()) { - editType = "'checkbox'"; - } else if (meta.isFK()) { - editType = "'formatEntityLabel'"; - } - return editType; - } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2011-12-05 08:24:55 UTC (rev 142) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2011-12-05 08:27:35 UTC (rev 143) @@ -30,6 +30,7 @@ import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.interceptor.ParameterAware; +import org.nuiton.topia.persistence.TopiaEntity; import java.util.List; import java.util.Map; @@ -71,7 +72,7 @@ public String execute() throws Exception { DbEditorService service = newService(DbEditorService.class); - TableMeta tableMeta = service.getTableMetas(entityType); + TableMeta tableMeta = service.getTableMeta(entityType); Map<String, String> properties = Maps.newHashMap(); List<String> columnNames = tableMeta.getColumnNames(); for (String columnName : columnNames) { @@ -92,9 +93,9 @@ } } } + properties.put(TopiaEntity.TOPIA_ID, id); service.saveEntity(tableMeta, - id, properties, getEchoBaseSession().getEchoBaseUser()); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/GetSqlResult.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/GetSqlResult.java 2011-12-05 08:24:55 UTC (rev 142) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/GetSqlResult.java 2011-12-05 08:27:35 UTC (rev 143) @@ -44,10 +44,6 @@ /** Datas of the given table. */ protected Map<?, ?>[] datas; - public GetSqlResult() { - super("datas_"); - } - public void setSql(String sql) { this.sql = sql; } @@ -78,7 +74,6 @@ @Override public String execute() throws Exception { - ExportSqlService service = newService(ExportSqlService.class); datas = service.executeSql(sql, pager); return SUCCESS; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/GetUsers.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/GetUsers.java 2011-12-05 08:24:55 UTC (rev 142) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/GetUsers.java 2011-12-05 08:27:35 UTC (rev 143) @@ -43,10 +43,6 @@ protected List<EchoBaseUserDTO> users; - public GetUsers() { - super("users_"); - } - public List<EchoBaseUserDTO> getUsers() { return users; } 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-12-05 08:24:55 UTC (rev 142) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-12-05 08:27:35 UTC (rev 143) @@ -257,9 +257,7 @@ </s:if> <s:else> <sjg:gridColumn name="%{#meta.name}" - title="%{getText(#meta.i18nKey)}" - formatter='%{getFormatter(#meta)}' - formatoptions="{newformat : 'd/m/Y'}" + title="%{#meta.name}" sortable="true" editable="true"/> </s:else> @@ -292,6 +290,7 @@ <s:hidden id="id" name='id' label=''/> <s:iterator value="columnMetas" var="meta" status="status"> + <s:set var="metaName" value='%{#meta.name}'/> <s:if test="#meta.fK"> <s:url id="urlName" action="getForeignEntities" @@ -299,29 +298,29 @@ escapeAmp="false"> <s:param name="entityType" value="%{#meta.typeSimpleName}"/> </s:url> - <sj:select id="%{#meta.name}" - label="%{getText(#meta.i18nKey)}" + <sj:select id="%{#metaName}" + label="%{#metaName}" href="%{urlName}" list="entities" emptyOption="true"/> </s:if> <s:else> <s:if test='#meta.columnType == "string"'> - <s:textfield id="%{#meta.name}" - name="%{#meta.name}" - label="%{getText(#meta.i18nKey)}" + <s:textfield id="%{#metaName}" + name="%{#metaName}" + label="%{#metaName}" disabled="%{#meta.fK}" value=""/> </s:if> <s:elseif test='#meta.columnType == "boolean"'> - <s:checkbox id="%{#meta.name}" - name="%{#meta.name}" - label="%{getText(#meta.i18nKey)}" value="%{false}"/> + <s:checkbox id="%{#metaName}" + name="%{#metaName}" + label="%{#metaName}" value="%{false}"/> </s:elseif> <s:elseif test='#meta.columnType == "date"'> - <sj:datepicker id="%{#meta.name}" - name="%{#meta.name}" - label="%{getText(#meta.i18nKey)}" + <sj:datepicker id="%{#metaName}" + name="%{#metaName}" + label="%{#metaName}" value="%{new java.util.Date()}" displayFormat="dd/mm/yy" timepicker="true" Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSql.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSql.jsp 2011-12-05 08:24:55 UTC (rev 142) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSql.jsp 2011-12-05 08:27:35 UTC (rev 143) @@ -96,7 +96,7 @@ <s:label value="%{query.lastModifiedDate}" readonly="true" label="%{getText('echobase.common.lastModifiedDate')}"/> - <s:label value="%{decorate(query.lastModifiedUser, null)}" readonly="true" + <s:label value="%{query.lastModifiedUser}" readonly="true" label="%{getText('echobase.common.lastModifiedUser')}"/> </s:if> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2011-12-05 08:24:55 UTC (rev 142) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2011-12-05 08:27:35 UTC (rev 143) @@ -29,11 +29,6 @@ <s:set var="emptySelection"><s:text name="echobase.message.noEntrySelection"/></s:set> <script type="text/javascript"> - function formatEntityLabel(cellvalue, options, rowObject) { - var columnName = options.colModel.name + "_lib"; - return rowObject[columnName]; - } - jQuery(document).ready(function () { $.addRowSelectTopic('datas', function(event){ var text = $("tr[aria-selected=true] td[aria-describedby='datas_modificationText']").text(); @@ -67,7 +62,7 @@ title="%{getText('echobase.common.modificationDate')}"/> <sjg:gridColumn name="modificationText" sortable="true" title="%{getText('echobase.common.modificationText')}"/> - <sjg:gridColumn name="modificationUser" sortable="true" formatter="formatEntityLabel" + <sjg:gridColumn name="modificationUser" sortable="true" title="%{getText('echobase.common.modificationUser')}"/> </sjg:grid> Modified: trunk/echobase-ui/src/site/rst/index.rst =================================================================== --- trunk/echobase-ui/src/site/rst/index.rst 2011-12-05 08:24:55 UTC (rev 142) +++ trunk/echobase-ui/src/site/rst/index.rst 2011-12-05 08:27:35 UTC (rev 143) @@ -21,7 +21,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - -baracouda-ui +EchoBase ui ============ Ce module définit l'application web du projet.