[Fmsystem-commits] [10578] API: fix update yui-tables

[Sigurd Nes]

Revision: 10578
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10578
Author:   sigurdne
Date:     2012-12-07 14:30:32 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
API: fix update yui-tables

Modified Paths:
--------------
    trunk/phpgwapi/js/yahoo/common.js

Modified: trunk/phpgwapi/js/yahoo/common.js
===================================================================
--- trunk/phpgwapi/js/yahoo/common.js   2012-12-07 14:29:39 UTC (rev 10577)
+++ trunk/phpgwapi/js/yahoo/common.js   2012-12-07 14:30:32 UTC (rev 10578)
@@ -205,9 +205,9 @@
 
        var DatatableName = 'datatable_container' + container;
        var PaginatorName = 'paginator_container' + container;
+//console.log(YAHOO.portico.Paginator);
+       requestUrl = requestUrl ? requestUrl : 
YAHOO.portico.requestUrl[DatatableName];
 
-       requestUrl = requestUrl ? requestUrl : 
YAHOO.portico.requestUrl.DatatableName;
-
        var callback =
        {
                success: function(o)
@@ -220,46 +220,49 @@
                                return;
                        }
 
-                       
YAHOO.portico.Paginator.PaginatorName.setRowsPerPage(values_ds.ResultSet.Result.length,true);
+                       var Paginator = YAHOO.portico.Paginator[PaginatorName];
 
                        //delete values of datatable
-                       
YAHOO.portico.DataTable.DatatableName.getRecordSet().reset();
+                       var DataTable = YAHOO.portico.DataTable[DatatableName];
+                       DataTable.getRecordSet().reset();
 
-                       //reset total records always to zero
-                       
YAHOO.portico.Paginator.PaginatorName.setTotalRecords(0,true);
-
                        //obtain records of the last DS and add to datatable
                        var record = values_ds.ResultSet.Result;
                        var newTotalRecords = 
values_ds.ResultSet.totalResultsAvailable;
 
                        if(record.length)
                        {
-                               
YAHOO.portico.DataTable.DatatableName.addRows(record);
+                               DataTable.addRows(record);
                        }
                        else
                        {
-                               YAHOO.portico.DataTable.DatatableName.render();
+                               DataTable.render();
                        }
 
-                       //update paginator with news values
-                       
YAHOO.portico.Paginator.PaginatorName.setTotalRecords(newTotalRecords,true);
+                       if(Paginator)
+                       {
+                               
Paginator.setRowsPerPage(values_ds.ResultSet.Result.length,true);
+                               //reset total records always to zero
+                               Paginator.setTotalRecords(0,true);
 
-                       if(typeof(values_ds.ResultSet.results) == 'undefined')
-                       {
-                               var results = 10;
+                               //update paginator with news values
+                               Paginator.setTotalRecords(newTotalRecords,true);
+                               if(typeof(values_ds.ResultSet.results) == 
'undefined')
+                               {
+                                       var results = 10;
+                               }
+                               else
+                               {
+                                       var results = 
values_ds.ResultSet.results;
+                               }
+                               
+                               var activePage = 
Math.floor(values_ds.ResultSet.startIndex / results) + 1;
+                               Paginator.setPage(activePage,true); //true no 
fuerza un recarge solo cambia el paginator
                        }
-                       else
-                       {
-                               var results = values_ds.ResultSet.results;
-                       }
-                               
-                       var activePage = 
Math.floor(values_ds.ResultSet.startIndex / results) + 1;
-                       
YAHOO.portico.Paginator.PaginatorName.setPage(activePage,true); //true no 
fuerza un recarge solo cambia el paginator
 
                        //update "sortedBy" values
-
                        values_ds.ResultSet.sortDir == "asc"? dir_ds = 
YAHOO.widget.DataTable.CLASS_ASC : dir_ds = YAHOO.widget.DataTable.CLASS_DESC;
-                       
YAHOO.portico.DataTable.DatatableName.set("sortedBy",{key:values_ds.ResultSet.sortKey,dir:dir_ds});
+                       
DataTable.set("sortedBy",{key:values_ds.ResultSet.sortKey,dir:dir_ds});
                },
                failure: function(o) {window.alert('Server or your connection 
is dead.')},
                timeout: 10000,
@@ -319,13 +322,13 @@
        options = options || {};
        options.dynamicData = true;
        
+       YAHOO.portico.Paginator[PaginatorName] = {};
        if(!disablePagination)
        {
                options.paginator = 
YAHOO.portico.setupInlineTablePaginator(paginatorContainer);
                url += '&results=' + options.paginator.getRowsPerPage() + '&';
 
-
-               YAHOO.portico.Paginator.PaginatorName =options.paginator;
+               YAHOO.portico.Paginator[PaginatorName] =options.paginator;
        }
 
 
@@ -361,8 +364,8 @@
                return data;
        };
 
-       YAHOO.portico.DataTable.DatatableName = myDataTable;
-       YAHOO.portico.requestUrl.DatatableName = url;
+       YAHOO.portico.DataTable[DatatableName] = myDataTable;
+       YAHOO.portico.requestUrl[DatatableName] = url;
 
        return {dataTable: myDataTable, dataSource: myDataSource};
 };