Author: tchemit Date: 2013-11-22 08:01:59 +0100 (Fri, 22 Nov 2013) New Revision: 892 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/892 Log: fixes #3851: Can't modify data anymore Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 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 2013-11-22 06:42:18 UTC (rev 891) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2013-11-22 07:01:59 UTC (rev 892) @@ -41,12 +41,16 @@ } @Override - public String input() throws Exception { + public String execute() throws Exception { load(); if (tableMeta != null) { exportFileName = "export-" + tableMeta.getEntityType().getSimpleName() + ".csv"; } - return INPUT; + return SUCCESS; } + + public boolean isAdmin() { + return getEchoBaseSession().isAdmin(); + } } Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2013-11-22 06:42:18 UTC (rev 891) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2013-11-22 07:01:59 UTC (rev 892) @@ -42,10 +42,10 @@ </result-types> <!-- Load db editor main page --> - <action name="dbeditor" method="input" + <action name="dbeditor" class="fr.ifremer.echobase.ui.actions.dbeditor.LoadEntities"> <interceptor-ref name="prepareParamsStackLogguedWithDb"/> - <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> + <result>/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> </action> <!-- Get foreign entities as a select box -->