r676 - in trunk/echobase-ui/src/main/resources: . config - Echobase-commits

21 Sep 2012

Author: tchemit
Date: 2012-09-21 12:29:14 +0200 (Fri, 21 Sep 2012)
New Revision: 676

Url: http://forge.codelutin.com/repositories/revision/echobase/676

Log:
fixes #1519: La pagination des tableaux n'est pas correcte


Modified:
   trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml
   trunk/echobase-ui/src/main/resources/config/struts-exportQuery.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/struts.xml

Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml
===================================================================

--- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml	2012-09-20 16:03:59 UTC (rev 675)
+++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml	2012-09-21 10:29:14 UTC (rev 676)
@@ -57,7 +57,7 @@
     <!-- Get datas of the selected table -->
     <action name="getTableDatas"
             class="fr.ifremer.echobase.ui.actions.dbeditor.GetEntities">
-      <result type="json"/>
+      <result type="jsonWithPager"/>
     </action>
 
     <!-- Get datas of the selected table -->

Modified: trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml
===================================================================
--- trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml	2012-09-20 16:03:59 UTC (rev 675)
+++ trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml	2012-09-21 10:29:14 UTC (rev 676)
@@ -79,7 +79,7 @@
     <!-- Get result of the export query execution -->
     <action name="getExportQueryResult"
             class="fr.ifremer.echobase.ui.actions.exportQuery.GetExportQueryResult">
-      <result type="json"/>
+      <result type="jsonWithPager"/>
     </action>
 
     <!-- Clone the export query -->

Modified: trunk/echobase-ui/src/main/resources/config/struts-removeData.xml
===================================================================
--- trunk/echobase-ui/src/main/resources/config/struts-removeData.xml	2012-09-20 16:03:59 UTC (rev 675)
+++ trunk/echobase-ui/src/main/resources/config/struts-removeData.xml	2012-09-21 10:29:14 UTC (rev 676)
@@ -65,7 +65,7 @@
     <!-- Get import logs entries -->
     <action name="getImportLogs" method="entityImportLogs"
             class="fr.ifremer.echobase.ui.actions.dbeditor.GetEntities">
-      <result type="json"/>
+      <result type="jsonWithPager"/>
     </action>
   </package>
 

Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml
===================================================================
--- trunk/echobase-ui/src/main/resources/config/struts-user.xml	2012-09-20 16:03:59 UTC (rev 675)
+++ trunk/echobase-ui/src/main/resources/config/struts-user.xml	2012-09-21 10:29:14 UTC (rev 676)
@@ -68,7 +68,7 @@
     <!-- Get list of users in database -->
     <action name="getUsers"
             class="fr.ifremer.echobase.ui.actions.user.GetUsers">
-      <result type="json"/>
+      <result type="jsonWithPager"/>
     </action>
 
   </package>

Modified: trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml
===================================================================
--- trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml	2012-09-20 16:03:59 UTC (rev 675)
+++ trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml	2012-09-21 10:29:14 UTC (rev 676)
@@ -130,9 +130,20 @@
     <!-- Get modification logs entries -->
     <action name="getEntityModificationLogs" method="entityModificationLogs"
             class="fr.ifremer.echobase.ui.actions.dbeditor.GetEntities">
-      <result type="json"/>
+      <result type="jsonWithPager"/>
     </action>
 
+    <!-- Get dashboard values -->
+    <action name="getDashboardImportLogs" method="dashboardImportLogs"
+            class="fr.ifremer.echobase.ui.actions.dbeditor.GetEntities">
+      <result type="jsonWithPager"/>
+    </action>
+
+    <!-- Show dashboard -->
+    <action name="dashboard" method="execute"
+            class="fr.ifremer.echobase.ui.actions.workingDb.DashBoard">
+      <result>/WEB-INF/jsp/workingDb/dashboard.jsp</result>
+    </action>
   </package>
 
 </struts>

Modified: trunk/echobase-ui/src/main/resources/struts.xml
===================================================================
--- trunk/echobase-ui/src/main/resources/struts.xml	2012-09-20 16:03:59 UTC (rev 675)
+++ trunk/echobase-ui/src/main/resources/struts.xml	2012-09-21 10:29:14 UTC (rev 676)
@@ -48,7 +48,7 @@
   <!--see http://struts.apache.org/2.2.3/docs/performance-tuning.html-->
   <constant name="struts.freemarker.templatesCache" value="true"/>
 
-  <package name="default" extends="json-default" abstract="true"
+  <package name="default" extends="struts-default" abstract="true"
            namespace="/">
 
     <result-types>
@@ -57,6 +57,14 @@
         <param name="actionName">home</param>
         <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">
+        <param name="includeProperties">
+          rows,page,total,records,datas,datas.*,sord,sidx,filters,searchField,searchString,searchOper
+        </param>
+        <param name="ignoreHierarchy">false</param>
+        <!--<param name="defaultEncoding">UTF-8</param>-->
+      </result-type>
     </result-types>
 
     <interceptors>

    

r676 - in trunk/echobase-ui/src/main/resources: . config

tchemit＠users.forge.codelutin.com

tags

participants (1)