[client-user] TemplateView : SelectionModel improvements

SITools2 · Nov 9, 2016 · 859bcf4 · 859bcf4
1 parent ad8df0d
commit 859bcf4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/...ace/client-user-3.0/app/controller/component/datasets/dataviews/TemplateViewController.js b/...ace/client-user-3.0/app/controller/component/datasets/dataviews/TemplateViewController.js
@@ -54,7 +54,7 @@ Ext.define('sitools.user.controller.component.datasets.dataviews.TemplateViewCon
 
                     templateView.primaryKeyValue = encodeURIComponent(templateView.primaryKeyValue);
 
-                    var url = templateView.urlRecords + "/records/" + templateView.primaryKeyValue;
+                    var url = templateView.dataset.sitoolsAttachementForUsers + "/records/" + templateView.primaryKeyValue;
                     Ext.apply(templateView.panelDetail, {
                         url: url
                     });
@@ -65,12 +65,10 @@ Ext.define('sitools.user.controller.component.datasets.dataviews.TemplateViewCon
                     var pageData = templateView.down('pagingtoolbar').getPageData();
 
                     //destroy all selections if all was selected and another row is selected
-                    if ((templateView.isAllSelected() && recs.length === DEFAULT_LIVEGRID_BUFFER_SIZE - 1) ||
-                        (templateView.isAllSelected() && pageData.currentPage === pageData.pageCount)) { // if last page and less than DEFAULT_LIVEGRID_BUFFER_SIZE number of records
+                    if (templateView.isAllSelected()) {
                         templateView.selectAllRowsBtn.toggle();
                         templateView.deselectAll();
-                        var unselectedRec = templateView.getUnselectedRow(recs, templateView.store.data.items);
-                        templateView.select(unselectedRec);
+                        templateView.select(rec);
                     }
                 },
                 newdataloaded: function (dataView) {

diff --git a/workspace/client-user-3.0/app/view/component/datasets/dataviews/TemplateViewView.js b/workspace/client-user-3.0/app/view/component/datasets/dataviews/TemplateViewView.js
@@ -44,8 +44,6 @@ Ext.define('sitools.user.view.component.datasets.dataviews.TemplateViewView', {
 
     initComponent: function () {
 
-        this.urlRecords = this.dataset.sitoolsAttachementForUsers;
-
         this.columnModel = getColumnModel(this.dataset.columnModel);
 
         this.origin = "sitools.user.view.component.datasets.dataviews.TemplateViewView";
@@ -225,7 +223,7 @@ Ext.define('sitools.user.view.component.datasets.dataviews.TemplateViewView', {
             border: false,
             primaryKeyName: this.store.primaryKey,
             grid: this,
-            baseUrl: this.dataset.sitoolsAttachementForUsers,
+            baseUrl: this.dataset.sitoolsAttachementForUsers + '/records/',
             boxMinWidth: 200,
             width: 500
         });

diff --git a/workspace/client-user-3.0/app/view/component/datasets/recordDetail/RecordDetailView.js b/workspace/client-user-3.0/app/view/component/datasets/recordDetail/RecordDetailView.js
@@ -66,7 +66,7 @@ Ext.define('sitools.user.view.component.datasets.recordDetail.RecordDetailView',
 
                 this.primaryKeyValue = this.recSelected.get(this.primaryKeyName);
                 this.primaryKeyValue = encodeURIComponent(this.primaryKeyValue);
-                this.url = this.baseUrl + 'records/' + this.primaryKeyValue;
+                this.url = this.baseUrl + this.primaryKeyValue;
 
                 break;
 
@@ -93,7 +93,7 @@ Ext.define('sitools.user.view.component.datasets.recordDetail.RecordDetailView',
 
                 this.primaryKeyValue = this.recSelected.get(this.primaryKeyName);
                 this.primaryKeyValue = encodeURIComponent(this.primaryKeyValue);
-                this.url = this.baseUrl + 'records/' + this.primaryKeyValue;
+                this.url = this.baseUrl + this.primaryKeyValue;
                 break;
         }
 
@@ -476,7 +476,7 @@ Ext.define('sitools.user.view.component.datasets.recordDetail.RecordDetailView',
                 }
                 this.primaryKeyValue = nextRec.get(this.primaryKeyName);
                 this.primaryKeyValue = encodeURIComponent(this.primaryKeyValue);
-                this.url = this.baseUrl + '/records/' + this.primaryKeyValue;
+                this.url = this.baseUrl + this.primaryKeyValue;
                 this.recSelected = nextRec;
                 this.grid.select(nextRec, false, true);
                 //this.expand();
@@ -528,7 +528,7 @@ Ext.define('sitools.user.view.component.datasets.recordDetail.RecordDetailView',
                 }
                 this.primaryKeyValue = nextRec.get(this.primaryKeyName);
                 this.primaryKeyValue = encodeURIComponent(this.primaryKeyValue);
-                this.url = this.baseUrl + '/records/' + this.primaryKeyValue;
+                this.url = this.baseUrl + this.primaryKeyValue;
                 this.recSelected = nextRec;
                 this.grid.select(nextRec, false, true);
                 this.expand();