Author: tchemit Date: 2012-09-23 14:33:53 +0200 (Sun, 23 Sep 2012) New Revision: 702 Url: http://forge.codelutin.com/repositories/revision/echobase/702 Log: - fix exception in remove data - add interceptor to check if working db is selected (otherwise redirect to home) Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java 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-removeData.xml trunk/echobase-ui/src/main/resources/config/struts-user.xml trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/resources/struts.xml Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2012-09-23 12:33:53 UTC (rev 702) @@ -113,7 +113,7 @@ this.progressModel = progressModel; } - public abstract long computeNbSteps(Voyage voyage, ImportLog importLog) throws TopiaException; + public abstract long computeNbSteps(Voyage voyage, ImportLog importLog); protected abstract void removeImportData(Voyage voyage, String id) throws TopiaException; @@ -401,11 +401,15 @@ } - protected long countCategoryUsingEchotype(final Voyage voyage) throws TopiaException { + protected long countCategoryUsingEchotype(final Voyage voyage) { String hql = "SELECT COUNT(DISTINCT c) FROM VoyageImpl v, CategoryImpl c WHERE " + "v = :voyage AND c.echotype in elements(v.echotype)"; - long result = categoryDAO.countByQuery(hql, "voyage", voyage); - return result; + try { + long result = categoryDAO.countByQuery(hql, "voyage", voyage); + return result; + } catch (TopiaException e) { + throw new EchoBaseTechnicalException(e); + } } public void incrementOp(String message) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-23 12:33:53 UTC (rev 702) @@ -55,7 +55,7 @@ } @Override - public long computeNbSteps(Voyage voyage, ImportLog importLog) throws TopiaException { + public long computeNbSteps(Voyage voyage, ImportLog importLog) { long result = importLog.sizeImportId(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-23 12:33:53 UTC (rev 702) @@ -55,7 +55,7 @@ } @Override - public long computeNbSteps(Voyage voyage, ImportLog importLog) throws TopiaException { + public long computeNbSteps(Voyage voyage, ImportLog importLog) { long result = importLog.sizeImportId(); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java 2012-09-23 12:33:53 UTC (rev 702) @@ -63,8 +63,8 @@ if (!check) { String redirectUrl = getRedirectUrl(); - if (log.isInfoEnabled()) { - log.info("Will redirect to " + redirectUrl); + if (log.isDebugEnabled()) { + log.debug("Will redirect to " + redirectUrl); } redirect(redirectUrl); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2012-09-23 12:33:53 UTC (rev 702) @@ -87,8 +87,10 @@ } return true; } - if (log.isInfoEnabled()) { - log.info("No user loggued!"); + } + if (!userLoggued) { + if (log.isDebugEnabled()) { + log.debug("User is not loggued, will redirect to home"); } } return userLoggued; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java 2012-09-23 12:33:53 UTC (rev 702) @@ -28,6 +28,8 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.ui.EchoBaseSession; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * To check if logged user is admin. @@ -39,6 +41,9 @@ private static final long serialVersionUID = 1L; + /** Logger. */ + private static final Log log = LogFactory.getLog(CheckUserIsAdmin.class); + @Override protected boolean doCheck(ActionInvocation invocation) { EchoBaseActionSupport action = (EchoBaseActionSupport) invocation.getAction(); @@ -48,6 +53,12 @@ EchoBaseUser user = echoBaseSession.getUser(); Preconditions.checkNotNull(user, "No user found is session"); - return user.isAdmin(); + boolean admin = user.isAdmin(); + if (!admin) { + if (log.isDebugEnabled()) { + log.debug("User is not admin, will redirect to home"); + } + } + return admin; } } Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java 2012-09-23 12:33:53 UTC (rev 702) @@ -0,0 +1,41 @@ +package fr.ifremer.echobase.ui.interceptors; + +import com.opensymphony.xwork2.ActionInvocation; +import fr.ifremer.echobase.ui.EchoBaseSession; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import static org.nuiton.i18n.I18n.l_; + +/** + * Checks that a working db was selected, otherwise redirect to home. + * + * @author tchemit <chemit@codelutin.com> + * @since 1.3 + */ +public class CheckWorkingDbSelected extends AbstractCheckInterceptor { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = + LogFactory.getLog(CheckLogguedInterceptor.class); + + @Override + protected boolean doCheck(ActionInvocation invocation) { + EchoBaseActionSupport action = (EchoBaseActionSupport) + invocation.getAction(); + + EchoBaseSession echoBaseSession = action.getEchoBaseSession(); + boolean dbSelected = echoBaseSession.isWorkingDbSelected(); + if (!dbSelected) { + action.addFlashMessage(l_(action.getLocale(), + "echobase.info.no.workingDb.selected")); + if (log.isDebugEnabled()) { + log.debug("No working db selected, will redirect to home"); + } + } + return dbSelected; + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision 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 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -29,7 +29,7 @@ <struts> - <package name="dbeditor" extends="loggued" namespace="/dbeditor"> + <package name="dbeditor" extends="logguedAndWithDb" namespace="/dbeditor"> <result-types> <result-type name="redirectToDbEditor" @@ -44,7 +44,7 @@ <!-- Load db editor main page --> <action name="dbeditor" method="input" class="fr.ifremer.echobase.ui.actions.dbeditor.LoadEntities"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> </action> Modified: trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -29,13 +29,13 @@ <struts> - <package name="embeddedApplication" extends="loggued" + <package name="embeddedApplication" extends="logguedAndWithDb" namespace="/embeddedApplication"> <!-- Configure embedded application archive --> <action name="configure" class="fr.ifremer.echobase.ui.actions.embeddedApplication.Configure"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input"> /WEB-INF/jsp/embeddedApplication/configure.jsp </result> @@ -48,7 +48,7 @@ <!-- Build embedded application archive --> <action name="build" method="execute" class="fr.ifremer.echobase.ui.actions.embeddedApplication.Build"> - <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="basicStackLogguedWithdb"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/embeddedApplication/progress.jsp</result> <result type="redirectAction"> Modified: trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -28,7 +28,7 @@ <struts> - <package name="exportDb" extends="loggued" namespace="/exportDb"> + <package name="exportDb" extends="logguedAndWithDb" namespace="/exportDb"> <!-- Configure export (input) --> <action name="configureInput" method="input" @@ -39,7 +39,7 @@ <!-- Configure export --> <action name="configure" method="execute" class="fr.ifremer.echobase.ui.actions.exportDb.Configure"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/exportDb/configure.jsp</result> <result type="redirectAction"> <param name="namespace">/exportDb</param> @@ -50,7 +50,7 @@ <!-- Build export --> <action name="export" method="execute" class="fr.ifremer.echobase.ui.actions.exportDb.Export"> - <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="basicStackLogguedWithdb"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/exportDb/progress.jsp</result> <result type="redirectAction"> @@ -68,7 +68,7 @@ <!-- Download export --> <action name="download" class="fr.ifremer.echobase.ui.actions.exportDb.Download"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <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-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -29,7 +29,7 @@ <struts> - <package name="exportQuery" extends="loggued" namespace="/exportQuery"> + <package name="exportQuery" extends="logguedAndWithDb" namespace="/exportQuery"> <result-types> <result-type name="redirectExportQuery" @@ -48,9 +48,10 @@ <interceptors> <!-- authenticated stack with params - prepare - params --> - <interceptor-stack name="paramsPrepareParamsStackLoggued"> + <interceptor-stack name="paramsPrepareParamsStackLogguedWithDb"> <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="checkWorkingDbSelected"/> <interceptor-ref name="paramsPrepareParamsStack"/> </interceptor-stack> </interceptors> @@ -58,7 +59,7 @@ <!-- Display export query main page --> <action name="manageExportQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result type="showList"/> </action> @@ -85,7 +86,7 @@ <!-- Clone the export query --> <action name="clone" method="cloneQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result name="input" type="showList"/> <result type="redirectExportQuery"/> </action> @@ -93,7 +94,7 @@ <!-- Save the export query --> <action name="save" method="saveQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result name="input" type="showList"/> <result type="redirectExportQuery"/> </action> @@ -101,23 +102,22 @@ <!-- Confirm to delete the export query --> <action name="confirmDelete" method="confirmDeleteQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result>/WEB-INF/jsp/exportQuery/confirmDelete.jsp</result> </action> <!-- Delete the export query --> <action name="delete" method="deleteQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result name="input" type="showList"/> <result type="redirectExportQuery"/> </action> - <!-- Download the sql query csv file --> <action name="downloadExportQueryResult" class="fr.ifremer.echobase.ui.actions.exportQuery.DownloadExportQueryResult"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-importData.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -28,12 +28,12 @@ <struts> - <package name="importData" extends="loggued" namespace="/importData"> + <package name="importData" extends="logguedAndWithDb" namespace="/importData"> <!-- Select import type --> <action name="selectImportType" class="fr.ifremer.echobase.ui.actions.importData.SelectImportType"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/importData/selectImportType.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> @@ -45,7 +45,7 @@ <!-- Configure import --> <action name="configure*-*" method="{2}" class="fr.ifremer.echobase.ui.actions.importData.Configure{1}Import"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/importData/configure{1}Import.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> @@ -56,7 +56,7 @@ <!-- Starts import --> <action name="import*" method="execute" class="fr.ifremer.echobase.ui.actions.importData.Launch{1}Import"> - <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="basicStackLogguedWithdb"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/importData/progress{1}Import.jsp</result> <result type="redirectAction"> @@ -86,7 +86,7 @@ <!-- CreateOrUpdate a new mission --> <action name="createMission" class="fr.ifremer.echobase.ui.actions.importData.CreateMission"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <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-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -28,7 +28,7 @@ <struts> - <package name="importDb" extends="loggued" namespace="/importDb"> + <package name="importDb" extends="logguedAndWithDb" namespace="/importDb"> <!-- Configure import (input) --> <action name="configureInput" method="input" @@ -39,7 +39,7 @@ <!-- Configure import (validate) --> <action name="configure" method="execute" class="fr.ifremer.echobase.ui.actions.importDb.Configure"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/importDb/configure.jsp</result> <result type="redirectAction"> <param name="namespace">/importDb</param> @@ -50,7 +50,7 @@ <!-- Starts import --> <action name="import" method="execute" class="fr.ifremer.echobase.ui.actions.importDb.Import"> - <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="basicStackLogguedWithdb"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/importDb/progress.jsp</result> <result type="redirectAction"> Modified: trunk/echobase-ui/src/main/resources/config/struts-removeData.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-removeData.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-removeData.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -26,7 +26,7 @@ <struts> - <package name="removeData" extends="loggued" namespace="/removeData"> + <package name="removeData" extends="logguedAndWithDb" namespace="/removeData"> <!-- Confirm to delete the importLog --> <action name="confirmDelete" @@ -41,7 +41,7 @@ <!-- Delete the importLog --> <action name="delete" method="execute" class="fr.ifremer.echobase.ui.actions.removeData.Delete"> - <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="basicStackLogguedWithdb"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/removeData/deleteProgress.jsp</result> <result type="redirectAction"> Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -31,8 +31,6 @@ <package name="user" extends="loggued" namespace="/user"> - <default-interceptor-ref name="basicStackLoggued"/> - <!-- Login --> <action name="login" class="fr.ifremer.echobase.ui.actions.user.Login" method="execute"> Modified: trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -47,6 +47,7 @@ <!-- Get db connexion informations --> <action name="information" class="fr.ifremer.echobase.ui.actions.workingDb.Information"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result>/WEB-INF/jsp/workingDb/information.jsp</result> </action> @@ -114,6 +115,7 @@ <!-- Get db modifications --> <action name="logs" class="fr.ifremer.echobase.ui.actions.EchoBaseActionSupport"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result>/WEB-INF/jsp/workingDb/modifications.jsp</result> </action> @@ -130,12 +132,14 @@ <!-- Get modification logs entries --> <action name="getEntityModificationLogs" method="entityModificationLogs" class="fr.ifremer.echobase.ui.actions.dbeditor.GetEntities"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result type="jsonWithPager"/> </action> <!-- Get dashboard values --> <action name="getDashboardImportLogs" method="dashboardImportLogs" class="fr.ifremer.echobase.ui.actions.dbeditor.GetEntities"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result type="jsonWithPager"/> </action> @@ -143,18 +147,21 @@ <!-- Get import log detail --> <action name="getDashboardImportLog" method="execute" class="fr.ifremer.echobase.ui.actions.workingDb.GetImportLogDetail"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result type="json"/> </action> <!-- Get voyage detail --> <action name="getDashboardVoyage" method="execute" class="fr.ifremer.echobase.ui.actions.workingDb.GetVoyage"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result type="json"/> </action> <!-- Show dashboard --> <action name="dashboard" method="execute" class="fr.ifremer.echobase.ui.actions.workingDb.DashBoard"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result>/WEB-INF/jsp/workingDb/dashboard.jsp</result> </action> </package> 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-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-23 12:33:53 UTC (rev 702) @@ -246,6 +246,7 @@ echobase.info.no.sqlQuery.selected=No SQL query selected echobase.info.no.table.selected=No table selected echobase.info.no.voyagee.found=No survey selected +echobase.info.no.workingDb.selected=No working database selected echobase.info.no.workingDbConfiguration.saved=No working database configuration saved echobase.info.no.workingDbConfiguration.selected=Select a working database configuration and then connect echobase.info.removeData.failed=Import removal failed 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-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-23 12:33:53 UTC (rev 702) @@ -246,6 +246,7 @@ echobase.info.no.sqlQuery.selected=Aucune requête d'export SQL sélectionnée echobase.info.no.table.selected=Aucune table sélectionnée echobase.info.no.voyagee.found=Aucune campagne à exporter +echobase.info.no.workingDb.selected=Aucune base de travail de sélectionnée echobase.info.no.workingDbConfiguration.saved=Aucune configuration de base de travail enregistrée echobase.info.no.workingDbConfiguration.selected=Sélectionner une configuration pour ensuite vous y connecter echobase.info.removeData.failed=La suppresion de l'import a échoué Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/struts.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -58,7 +58,8 @@ <param name="namespace">/</param> </result-type> <result-type name="json" class="org.apache.struts2.json.JSONResult"/> - <result-type name="jsonWithPager" class="org.apache.struts2.json.JSONResult"> + <result-type name="jsonWithPager" + class="org.apache.struts2.json.JSONResult"> <param name="includeProperties"> rows,page,total,records,datas,datas.*,sord,sidx,filters,searchField,searchString,searchOper </param> @@ -85,6 +86,11 @@ <param name="redirectAction">/home</param> </interceptor> + <interceptor name="checkWorkingDbSelected" + class="fr.ifremer.echobase.ui.interceptors.CheckWorkingDbSelected"> + <param name="redirectAction">/home</param> + </interceptor> + </interceptors> <!-- default action to use everywhere (fix i18n when not translated) --> @@ -123,12 +129,35 @@ <interceptor-ref name="defaultStack"/> </interceptor-stack> + <!-- basic authenticated stack --> + <interceptor-stack name="basicStackLogguedWithdb"> + <interceptor-ref name="i18n"/> + <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="checkWorkingDbSelected"/> + <interceptor-ref name="basicStack"/> + </interceptor-stack> + + <!-- authenticated stack with prepare - params--> + <interceptor-stack name="prepareParamsStackLogguedWithDb"> + <interceptor-ref name="i18n"/> + <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="checkWorkingDbSelected"/> + <interceptor-ref name="defaultStack"/> + </interceptor-stack> + </interceptors> <!-- must be authenticated to perform any actions --> <default-interceptor-ref name="basicStackLoggued"/> </package> + + <package name="logguedAndWithDb" extends="loggued" abstract="true"> + + <!-- must be authenticated to perform any actions --> + <default-interceptor-ref name="basicStackLogguedWithdb"/> + + </package> <package name="applicationDefault" extends="default" namespace="/"> <default-action-ref name="home"/>