Merge pull request #5 from booxmedialtd/sandesh/BPLAT-4088CMSUserRolesUI

BPLAT-4391 Removed dataTable to CMSUser Roles
booxmedialtd · Jan 11, 2018 · 02114dd · 02114dd
2 parents b305fd0 + a19f87d
commit 02114dd
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 61 deletions.
diff --git a/controllers/AssignmentController.php b/controllers/AssignmentController.php
@@ -22,7 +22,8 @@ public function actionIndex()
         $this->render(
             'index',
             array(
-                'dataProvider' => $dataProvider
+                'dataProvider' => $dataProvider,
+                'pagination'=> ['pageSize' => 25],
             )
         );
     }
@@ -137,4 +138,4 @@ protected function getAssignmentOptions($userId)
 
         return $options;
     }
-}
+}
diff --git a/controllers/AuthItemController.php b/controllers/AuthItemController.php
@@ -29,6 +29,7 @@ public function actionIndex()
             'index',
             array(
                 'dataProvider' => $dataProvider,
+                'pagination'=> ['pageSize' => 25],
             )
         );
     }
@@ -314,4 +315,4 @@ public function getViewPath()
     {
         return $this->module->getViewPath() . DIRECTORY_SEPARATOR . 'authItem';
     }
-}
+}
diff --git a/views/assignment/index.php b/views/assignment/index.php
@@ -16,7 +16,6 @@
         'type' => [TbHtml::GRID_TYPE_BORDERED, TbHtml::GRID_TYPE_STRIPED],
         'dataProvider' => $dataProvider,
         'emptyText' => Yii::t('AuthModule.main', 'No assignments found.'),
-        'template' => "{items}",
         'columns' => [
             [
                 'header' => Yii::t('AuthModule.main', 'User'),
@@ -32,16 +31,3 @@
         ],
     ]
 );
-
-Yii::app()->clientScript->registerScript('authComponents', "
-        $(function () {   
-            // initialize dataTable
-            $('#auth-grid table').DataTable({
-              'paging'      : true,
-              'lengthChange': true,
-              'searching'   : true,
-              'ordering'    : true,
-              'info'        : true,
-              'autoWidth'   : false
-            });
-        })", CClientScript::POS_END);
diff --git a/views/assignment/view.php b/views/assignment/view.php
@@ -31,7 +31,6 @@
         'type' => [TbHtml::GRID_TYPE_BORDERED, TbHtml::GRID_TYPE_STRIPED],
         'dataProvider' => $authItemDp,
         'emptyText' => Yii::t('AuthModule.main', 'This user does not have any assignments.'),
-        'template' => "{items}",
         'columns' => [
             [
                 'class' => 'AuthItemDescriptionColumn',
@@ -72,18 +71,4 @@
     <?php $this->endWidget(); ?>
 
 <?php endif; ?>
-<?php
-
-Yii::app()->clientScript->registerScript('authComponents', "
-        $(function () {   
-            // initialize dataTable
-            $('#auth-view-grid table').DataTable({
-              'paging'      : true,
-              'lengthChange': true,
-              'searching'   : true,
-              'ordering'    : true,
-              'info'        : true,
-              'autoWidth'   : false
-            });
-        })", CClientScript::POS_END);
 
diff --git a/views/authItem/index.php b/views/authItem/index.php
@@ -24,7 +24,6 @@
         'id' => 'task-grid',
         'dataProvider' => $dataProvider,
         'emptyText' => Yii::t('AuthModule.main', 'No {type} found.', ['{type}' => $this->getTypeText(true)]),
-        'template' => "{items}",
         'columns' => [
             [
                 'name' => 'name',
@@ -64,17 +63,3 @@
     ]
 );
 
-Yii::app()->clientScript->registerScript('streamProfileComponents', "
-        $(function () {
-                 
-            // initialize dataTable
-            $('#task-grid table').DataTable({
-              'paging'      : true,
-              'lengthChange': true,
-              'searching'   : true,
-              'ordering'    : true,
-              'info'        : true,
-              'autoWidth'   : false
-            });
-                 
-        })", CClientScript::POS_END);
diff --git a/views/authItem/view.php b/views/authItem/view.php
@@ -114,7 +114,6 @@
         'type' => [TbHtml::GRID_TYPE_BORDERED, TbHtml::GRID_TYPE_STRIPED],
         'dataProvider' => $descendantDp,
         'emptyText' => Yii::t('AuthModule.main', 'This item does not have any descendants.'),
-        'template' => "{items}",
         'columns' => [
             [
                 'class' => 'AuthItemDescriptionColumn',
@@ -155,16 +154,3 @@
     <?php $this->endWidget(); ?>
 
 <?php endif;
-
-Yii::app()->clientScript->registerScript('authComponents', "
-        $(function () {   
-            // initialize dataTable
-            $('#authitem-view-grid table').DataTable({
-              'paging'      : true,
-              'lengthChange': true,
-              'searching'   : true,
-              'ordering'    : true,
-              'info'        : true,
-              'autoWidth'   : false
-            });
-        })", CClientScript::POS_END);