show all table entries by default

Jehu · Feb 19, 2012 · 8b70cc3 · 8b70cc3
1 parent 02442f7
commit 8b70cc3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/frontend/js/controllers.js b/frontend/js/controllers.js
@@ -24,7 +24,13 @@ function ContactsListCtrl($xhr,$defer,$location,globalObjects,ResContacts) {
             { "bSearchable": false, "bSortable": false }
         ];
         self.$eval();
-        jQuery('#table-contacts').dataTable( {"bJQueryUI": true, "aoColumns": tblColumns, "bDestroy": true } );
+        jQuery('#table-contacts').dataTable( {
+            "bJQueryUI": true,
+            "aLengthMenu": [[-1, 25, 50, 100], ["All", 25, 50, 100]],
+            //"bPaginate": true,
+            "aoColumns": tblColumns,
+            "bDestroy": true
+        });
     });
 
     self.editContact = function(contact) {
@@ -67,7 +73,7 @@ function ContactEditCtrl($location, globalObjects, ResContacts, ResTerritories)
     }
 
     self.deleteContact = function(contact) {
-        // FIXME ask user if he want delete this really!
+        // FIXME ask user if he want really delete this!
 
         var hasTerritories = checkHasTerritories(contact, ResTerritories);
         if(Boolean(hasTerritories)) {
@@ -179,7 +185,12 @@ function TerritoriesListCtrl($xhr, $defer, $resource, $location, globalObjects,
             null,
             { "bSortable": false },
         ];
-        var tblConfig = { "bJQueryUI": true, "aoColumns": tblColumns };
+        var tblConfig = {
+            "bJQueryUI": true,
+            "aLengthMenu": [[-1, 25, 50, 100], ["All", 25, 50, 100]],
+            //"bPaginate": true,
+            "aoColumns": tblColumns
+        };
         //$("select, input:checkbox, input:text, input:password, input:radio, input:file, textarea").uniform();
         jQuery('#table-territories').dataTable(tblConfig);
     });

diff --git a/frontend/themes/01/partials/territoriesList.html b/frontend/themes/01/partials/territoriesList.html
@@ -50,7 +50,7 @@
             <td><span ng:hide="territory.contact.name">-- {{'in the box'|i18n}} --</span>{{territory.contact.name}}</td>
             <td>{{territory.status_changed_at|i18nDate}}</td>
             <td>{{territory.last_processed_at|i18nDate}}</td>
-            <td>
+            <td style="width: 200px;">
                 <button class="btn btn-primary" name="{{'Info'|i18n}}" ng:click="showTerritoryInfo(territory)" my:dialog="show('territory-info',{modal:true})">{{'info'|i18n}}</button>
                 <button class="btn" ng:click="editTerritory(territory)">{{'edit'|i18n}}</button>
                 <button class="btn btn-success" ng:show="territory.contact.name" ng:click="processed(territory)" ng:bind="'processed'|i18n"></button>