- Echobase-commits - mailman.cloud.codelutin.com

r479 - trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 16:03:20 +0200 (Tue, 03 Apr 2012) New Revision: 479 Url: http://forge.codelutin.com/repositories/revision/echobase/479 Log: use topia api Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java 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 2012-04-03 14:01:26 UTC (rev 478) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java 2012-04-03 14:03:20 UTC (rev 479) @@ -27,7 +27,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.struts2.json.JSONException; import org.apache.struts2.json.JSONUtil; -import org.nuiton.web.struts2.FilterPagerUtil; +import org.nuiton.topia.persistence.TopiaFilterPagerUtil; import java.util.Collection; import java.util.Map; @@ -50,7 +50,8 @@ public abstract Integer getRecords(); - protected FilterPagerUtil.FilterPagerBean pager = new FilterPagerUtil.FilterPagerBean(); + protected TopiaFilterPagerUtil.FilterPagerBean pager = + new TopiaFilterPagerUtil.FilterPagerBean(); // sorting order - asc or desc protected String sord; @@ -140,7 +141,7 @@ Collection<Map<String, String>> rules = (Collection<Map<String, String>>) filterObject.get("rules"); - FilterPagerUtil.newFilterPagerBeanBuilder(groupOp). + TopiaFilterPagerUtil.newFilterPagerBeanBuilder(groupOp). addOperations(rules). flush(pager); } else { @@ -153,7 +154,7 @@ rule.put("op", searchOper); rule.put("field", searchField); rule.put("data", searchString); - FilterPagerUtil.newFilterPagerBeanBuilder("AND"). + TopiaFilterPagerUtil.newFilterPagerBeanBuilder("AND"). addRule(rule). flush(pager); }

1 0

r478 - trunk
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 16:01:26 +0200 (Tue, 03 Apr 2012) New Revision: 478 Url: http://forge.codelutin.com/repositories/revision/echobase/478 Log: fixes #1080: Updates to nuiton-utils 2.4.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-03 12:15:20 UTC (rev 477) +++ trunk/pom.xml 2012-04-03 14:01:26 UTC (rev 478) @@ -125,7 +125,7 @@ <eugenePluginVersion>2.4.2</eugenePluginVersion> <topiaVersion>2.6.9</topiaVersion> - <nuitonUtilsVersion>2.4.6</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.7</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.10</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion>

1 0

r477 - in trunk/echobase-ui/src/main: java/fr/ifremer/echobase/ui/actions/dbeditor resources/config webapp/WEB-INF/jsp/dbeditor
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 14:15:20 +0200 (Tue, 03 Apr 2012) New Revision: 477 Url: http://forge.codelutin.com/repositories/revision/echobase/477 Log: fixes #1077: Am?\195?\169liorer le message d'erreur lors d'un import ?\195?\169chou?\195?\169 Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java 2012-04-03 11:37:06 UTC (rev 476) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java 2012-04-03 12:15:20 UTC (rev 477) @@ -23,10 +23,10 @@ */ package fr.ifremer.echobase.ui.actions.dbeditor; -import com.google.common.base.Throwables; import com.opensymphony.xwork2.interceptor.annotations.InputConfig; import fr.ifremer.echobase.csv.CsvImportResult; import fr.ifremer.echobase.services.ImportService; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -63,6 +63,8 @@ /** CSV import result */ private CsvImportResult result; + private Exception error; + public CsvImportResult getResult() { return result; } @@ -100,6 +102,20 @@ this.createIfNotFound = createIfNotFound; } + public Exception getError() { + return error; + } + + public String getErrorStack() { + + String errorStack = null; + if (error != null) { + + errorStack = ExceptionUtils.getStackTrace(error); + } + return errorStack; + } + @Override public String input() throws Exception { load(); @@ -108,7 +124,6 @@ @Override @InputConfig(methodName = "input") - // to call input method on validation error to initialize dbeditor page public String execute() throws Exception { ImportService importService = newService(ImportService.class); @@ -121,11 +136,17 @@ getEchoBaseSession().getEchoBaseUser()); } catch (Exception eee) { - String message = "Failed to import datas : "; - log.error(message, eee); - addActionError(message + Throwables.getRootCause(eee).getMessage()); - return ERROR; + result = CsvImportResult.newResult(entityType, + importFileFileName, + false); + error = eee; + + addActionError(_("echobase.info.import.failed")); + + if (log.isErrorEnabled()) { + log.error("Error while import ", eee); + } } return SUCCESS; Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-04-03 11:37:06 UTC (rev 476) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-04-03 12:15:20 UTC (rev 477) @@ -78,7 +78,7 @@ <interceptor-ref name="prepareParamsStackLoggued"/> <result>/WEB-INF/jsp/dbeditor/csvImportResult.jsp</result> <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> - <result name="error">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> +  </action>  Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp 2012-04-03 11:37:06 UTC (rev 476) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp 2012-04-03 12:15:20 UTC (rev 477) @@ -25,24 +25,40 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <title><s:text name="echobase.title.dbEditor"/></title> -<h2> - <s:text name="echobase.info.dbeditor.propertyDiffsResult"/> -</h2> +<fieldset> + <legend><s:text name="echobase.info.dbeditor.propertyDiffsResult"/></legend> -<fieldset> <s:label key="result.entityType" label="%{getText('echobase.common.entityType')}"/> <s:label key="result.importFileName" label="%{getText('echobase.label.importFile')}"/> - <s:label key="result.numberCreated" - label="%{getText('echobase.label.numberOfCreatedEntities')}"/> + <s:if test="hasActionErrors()"> + <s:label key="error.message" labelSeparator="" + label="%{getText('echobase.common.importError')}"/> + <%--div class="cleanBoth"> + <s:text name="echobase.common.importError"/> + <strong> + <s:property value="error.message"/> + </strong> + </div--%> + <pre id="errorStack"> + <code> + <s:property value="errorStack"/> + </code> + </pre> + </s:if> + <s:else> - <s:label key="result.numberUpdated" - label="%{getText('echobase.label.numberOfUpdatedEntities')}"/> + <s:label key="result.numberCreated" + label="%{getText('echobase.label.numberOfCreatedEntities')}"/> + + <s:label key="result.numberUpdated" + label="%{getText('echobase.label.numberOfUpdatedEntities')}"/> + </s:else> + </fieldset> - <s:a namespace="/dbeditor" action="dbeditor"> <s:param name="entityType" value="%{result.entityType}"/> <s:text name="echobase.action.return"/>

1 0

r476 - in trunk/echobase-ui/src/main/resources: . config
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 13:37:06 +0200 (Tue, 03 Apr 2012) New Revision: 476 Url: http://forge.codelutin.com/repositories/revision/echobase/476 Log: avoid to use a params-prepare-params stack Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml trunk/echobase-ui/src/main/resources/config/struts-importData.xml trunk/echobase-ui/src/main/resources/config/struts-importDb.xml trunk/echobase-ui/src/main/resources/config/struts-user.xml trunk/echobase-ui/src/main/resources/struts.xml Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -44,7 +44,7 @@  <action name="dbeditor" method="input" class="fr.ifremer.echobase.ui.actions.dbeditor.LoadEntities"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> </action> @@ -75,7 +75,7 @@  <action name="doImport" class="fr.ifremer.echobase.ui.actions.dbeditor.ImportTable"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result>/WEB-INF/jsp/dbeditor/csvImportResult.jsp</result> <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> <result name="error">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> @@ -84,7 +84,7 @@  <action name="doExport" class="fr.ifremer.echobase.ui.actions.dbeditor.ExportTable"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -35,7 +35,7 @@  <action name="configure" class="fr.ifremer.echobase.ui.actions.embeddedApplication.Configure"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input"> /WEB-INF/jsp/embeddedApplication/configure.jsp </result> @@ -58,7 +58,7 @@  <action name="download" class="fr.ifremer.echobase.ui.actions.embeddedApplication.Download"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -33,7 +33,7 @@  <action name="configure" class="fr.ifremer.echobase.ui.actions.exportDb.Configure"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/exportDb/configure.jsp</result> <result type="redirectAction"> <param name="namespace">/exportDb</param> @@ -54,7 +54,7 @@  <action name="download" class="fr.ifremer.echobase.ui.actions.exportDb.Download"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -41,6 +41,15 @@ </result-types> + <interceptors> +  + <interceptor-stack name="paramsPrepareParamsStackLoggued"> + <interceptor-ref name="i18n"/> + <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="paramsPrepareParamsStack"/> + </interceptor-stack> + </interceptors> +  <action name="manageExportQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> Modified: trunk/echobase-ui/src/main/resources/config/struts-importData.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -45,7 +45,7 @@  <action name="configure*-*" method="{2}" class="fr.ifremer.echobase.ui.actions.importData.Configure{1}Import"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/importData/configure{1}Import.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> @@ -77,7 +77,7 @@  <action name="createMission" class="fr.ifremer.echobase.ui.actions.importData.CreateMission"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/importData/createMission.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-importDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -33,7 +33,7 @@  <action name="configure" class="fr.ifremer.echobase.ui.actions.importDb.Configure"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/importDb/configure.jsp</result> <result type="redirectAction"> <param name="namespace">/importDb</param> @@ -42,8 +42,7 @@ </action>  - <action name="import" - class="fr.ifremer.echobase.ui.actions.importDb.Import" + <action name="import" class="fr.ifremer.echobase.ui.actions.importDb.Import" method="execute"> <interceptor-ref name="basicStackLoggued"/> <interceptor-ref name="execAndWait"/> Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -64,7 +64,7 @@  <action name="user-*" class="fr.ifremer.echobase.ui.actions.user.{1}"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <interceptor-ref name="checkUserIsAdmin"/> <result name="input">/WEB-INF/jsp/user/{1}.jsp</result> <result>/WEB-INF/jsp/user/userList.jsp</result> Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/struts.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -114,13 +114,6 @@ <interceptor-ref name="defaultStack"/> </interceptor-stack> -  - <interceptor-stack name="paramsPrepareParamsStackLoggued"> - <interceptor-ref name="i18n"/> - <interceptor-ref name="checkUserLoggued"/> - <interceptor-ref name="paramsPrepareParamsStack"/> - </interceptor-stack> - </interceptors>

1 0

r475 - trunk/echobase-ui/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 13:33:16 +0200 (Tue, 03 Apr 2012) New Revision: 475 Url: http://forge.codelutin.com/repositories/revision/echobase/475 Log: clean i18n Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-04-03 11:31:24 UTC (rev 474) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-04-03 11:33:16 UTC (rev 475) @@ -53,4 +53,5 @@ echobase.menu.editData=Modify datas echobase.menu.viewData=view datas echobase.title.confirm.deleteQuery=Delete a export query +echobase.title.dbEditor.read=Visualisation des données echobase.title.newLibreOfficeQuery=Import a new "Libre-Office" request 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 2012-04-03 11:31:24 UTC (rev 474) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-04-03 11:33:16 UTC (rev 475) @@ -236,6 +236,7 @@ echobase.title.createEmbeddedApplication=Création de l'application embarquée echobase.title.createMission=Créer une mission echobase.title.dbEditor=Modification de la base +echobase.title.dbEditor.read=Visualisation des données echobase.title.embeddedApplicationProgress=Création de l'application embarquée en cours echobase.title.embeddedApplicationResult=Résultat de la création de l'application embarquée echobase.title.entityModificationLogs=Journal des modifications

1 0

r474 - trunk/echobase-ui/src/main/resources
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 13:31:24 +0200 (Tue, 03 Apr 2012) New Revision: 474 Url: http://forge.codelutin.com/repositories/revision/echobase/474 Log: refs #1016: Int?\195?\169grer les traductions anglaises (ne pas polluer l'url avec la langue utilis?\195?\169e) Modified: trunk/echobase-ui/src/main/resources/struts.xml Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2012-04-03 11:30:26 UTC (rev 473) +++ trunk/echobase-ui/src/main/resources/struts.xml 2012-04-03 11:31:24 UTC (rev 474) @@ -107,18 +107,18 @@ <interceptor-ref name="basicStack"/> </interceptor-stack> -  - <interceptor-stack name="paramsPrepareParamsStackLoggued"> +  + <interceptor-stack name="prepareParamsStackLoggued"> <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> - <interceptor-ref name="paramsPrepareParamsStack"/> + <interceptor-ref name="defaultStack"/> </interceptor-stack> -  - <interceptor-stack name="prepareParamsStackLoggued"> +  + <interceptor-stack name="paramsPrepareParamsStackLoggued"> <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> - <interceptor-ref name="defaultStack"/> + <interceptor-ref name="paramsPrepareParamsStack"/> </interceptor-stack> </interceptors> @@ -138,6 +138,19 @@ <result>/WEB-INF/jsp/home.jsp</result> <interceptor-ref name="i18nStack"/> + <interceptor-ref name="checkUserLoggued"/> + </action> + +  + <action name="changeLang" + class="fr.ifremer.echobase.ui.actions.EchoBaseActionSupport"> + + <result type="redirectAction"> + <param name="namespace">/</param> + <param name="actionName">home</param> + </result> + + <interceptor-ref name="i18nStack"/>  <interceptor-ref name="paramRemover"> <param name="paramNames">request_locale</param>

1 0

r473 - trunk/echobase-ui/src/main/webapp/WEB-INF/includes
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 13:30:26 +0200 (Tue, 03 Apr 2012) New Revision: 473 Url: http://forge.codelutin.com/repositories/revision/echobase/473 Log: refs #1016: Int?\195?\169grer les traductions anglaises (ne pas polluer l'url avec la langue utilis?\195?\169e) Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp 2012-04-03 11:26:00 UTC (rev 472) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp 2012-04-03 11:30:26 UTC (rev 473) @@ -34,7 +34,7 @@ </s:a> </s:if> <s:else> - <s:a namespace="/" action="home" cssClass="francais i18nNonActive" + <s:a namespace="/" action="changeLang" cssClass="francais i18nNonActive" title="%{toFrench}"> <s:param name="request_locale">fr</s:param> </s:a> @@ -47,7 +47,7 @@ </s:a> </s:if> <s:else> - <s:a namespace="/" action="home" cssClass="anglais i18nNonActive" + <s:a namespace="/" action="changeLang" cssClass="anglais i18nNonActive" title="%{toEnglish}"> <s:param name="request_locale">en</s:param> </s:a>

1 0

r472 - trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 13:26:00 +0200 (Tue, 03 Apr 2012) New Revision: 472 Url: http://forge.codelutin.com/repositories/revision/echobase/472 Log: refs #1047: Finaliser la charte graphique + changement de titre si utilisateur non admin Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 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 2012-04-03 11:25:05 UTC (rev 471) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-04-03 11:26:00 UTC (rev 472) @@ -32,7 +32,14 @@ <s:set name="tableSelected" value="%{entityType != null}"/> -<title><s:text name="echobase.title.dbEditor"/></title> +<title> + <s:if test="admin"> + <s:text name="echobase.title.dbEditor"/> + </s:if> + <s:else> + <s:text name="echobase.title.dbEditor.read"/> + </s:else> +</title> <script type="text/javascript"> @@ -362,6 +369,7 @@ </s:iterator> </fieldset> <s:if test="admin"> + <div class="toolbar"> <ul class="toolbar floatRight"> <li><s:submit name='resetAction' key="echobase.action.reset" theme="simple" onclick="return false;"/> @@ -370,6 +378,7 @@ action="editTableData" theme="simple"/> </li> </ul> + </div> </s:if> </s:form>

1 0

r471 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user echobase-ui/src/main/webapp/WEB-INF/jsp/user
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 13:25:05 +0200 (Tue, 03 Apr 2012) New Revision: 471 Url: http://forge.codelutin.com/repositories/revision/echobase/471 Log: fixes #1076: Apr?\195?\168s la modification d'un utilisateur le mot de passe est perdu Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java 2012-04-03 11:24:28 UTC (rev 470) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java 2012-04-03 11:25:05 UTC (rev 471) @@ -74,6 +74,21 @@ } } + public EchoBaseUser getUserById(String userId) { + Preconditions.checkNotNull(userId); + try { + EchoBaseUserDAO dao = getDAO(EchoBaseUser.class, EchoBaseUserDAO.class); + EchoBaseUser user = dao.findByTopiaId(userId); + EchoBaseUser result = newUser(); + result.setEmail(user.getEmail()); + result.setPassword(user.getPassword()); + result.setAdmin(user.isAdmin()); + return result; + } catch (TopiaException eee) { + throw new EchoBaseTechnicalException(eee); + } + } + public void createOrUpdate(EchoBaseUser user) { try { EchoBaseUserDAO dao = getDAO(EchoBaseUser.class, EchoBaseUserDAO.class); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java 2012-04-03 11:24:28 UTC (rev 470) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java 2012-04-03 11:25:05 UTC (rev 471) @@ -30,14 +30,17 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.struts2.interceptor.ParameterAware; +import java.util.Map; + /** * To delete a user. * * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class Delete extends EchoBaseActionSupport implements Preparable { +public class Delete extends EchoBaseActionSupport implements Preparable, ParameterAware { protected static final Log log = LogFactory.getLog(Delete.class); @@ -47,6 +50,8 @@ protected EchoBaseUser user; + private Map<String, String[]> parameters; + public UserService getUserService() { if (userService == null) { userService = newService(UserService.class); @@ -80,16 +85,21 @@ @Override public void prepare() throws Exception { - String userId = getUser().getTopiaId(); + String userId = parameters.get("user.topiaId")[0]; if (!StringUtils.isEmpty(userId)) { // load user - user = getUserService().getEntityById(EchoBaseUser.class, userId); - + user = getUserService().getUserById(userId); + // do not want to have the password + user.setPassword(""); if (log.isInfoEnabled()) { log.info("Selected user " + user.getEmail()); } } + } + @Override + public void setParameters(Map<String, String[]> parameters) { + this.parameters=parameters; } } \ No newline at end of file Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java 2012-04-03 11:24:28 UTC (rev 470) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java 2012-04-03 11:25:05 UTC (rev 471) @@ -30,14 +30,17 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.struts2.interceptor.ParameterAware; +import java.util.Map; + /** * To update a user. * * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class Update extends EchoBaseActionSupport implements Preparable { +public class Update extends EchoBaseActionSupport implements Preparable, ParameterAware { protected static final Log log = LogFactory.getLog(Update.class); @@ -47,6 +50,8 @@ protected EchoBaseUser user; + private Map<String, String[]> parameters; + public UserService getUserService() { if (userService == null) { userService = newService(UserService.class); @@ -73,12 +78,13 @@ @Override public void prepare() throws Exception { - String userId = getUser().getTopiaId(); + String userId = parameters.get("user.topiaId")[0]; if (!StringUtils.isEmpty(userId)) { // load user - user = getUserService().getEntityById(EchoBaseUser.class, userId); - + user = getUserService().getUserById(userId); + // do not want to update password + user.setPassword(""); if (log.isInfoEnabled()) { log.info("Selected user " + user.getEmail()); } @@ -92,4 +98,8 @@ return user; } + @Override + public void setParameters(Map<String, String[]> parameters) { + this.parameters=parameters; + } } \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp 2012-04-03 11:24:28 UTC (rev 470) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp 2012-04-03 11:25:05 UTC (rev 471) @@ -48,8 +48,7 @@ }); </script> -<sjg:grid id="users" caption="%{getText('echobase.header.user.gridTitle')}" - dataType="json" href="%{loadUrl}" gridModel="users" +<sjg:grid id="users" dataType="json" href="%{loadUrl}" gridModel="users" pager="true" pagerButtons="true" pagerInput="true" navigator="true" rownumbers="false" autowidth="true" onSelectRowTopics='users-rowSelect'

1 0

r470 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 13:24:28 +0200 (Tue, 03 Apr 2012) New Revision: 470 Url: http://forge.codelutin.com/repositories/revision/echobase/470 Log: fixes #1075: La cr?\195?\169ation de requ?\195?\168te ne fonctionne plus Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java 2012-04-03 11:23:18 UTC (rev 469) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java 2012-04-03 11:24:28 UTC (rev 470) @@ -101,19 +101,21 @@ ExportQuery entityToSave; + exportQuery.setLastModifiedDate(newDate()); + exportQuery.setLastModifiedUser(user.getEmail()); + if (mustCreate) { - entityToSave = dao.create(); + entityToSave = dao.create(exportQuery); } else { entityToSave = dao.findByTopiaId(id); +// entityToSave.setName(queryName); + entityToSave.setDescription(exportQuery.getDescription()); + entityToSave.setSqlQuery(exportQuery.getSqlQuery()); + entityToSave.setLastModifiedDate(exportQuery.getLastModifiedDate()); + entityToSave.setLastModifiedUser(exportQuery.getLastModifiedUser()); } - entityToSave.setName(queryName); - entityToSave.setDescription(exportQuery.getDescription()); - entityToSave.setSqlQuery(exportQuery.getSqlQuery()); - entityToSave.setLastModifiedDate(newDate()); - entityToSave.setLastModifiedUser(user.getEmail()); - - dao.update(entityToSave); +// dao.update(entityToSave); getTransaction().commitTransaction(); return entityToSave; } catch (TopiaException eee) {

1 0