diff --git a/modules/Portal/views/List.php b/modules/Portal/views/List.php index 2e0bef6cf02d6fbabd9c9ef84ab0abf24c904ffd..bda02b40ff74d7f9b087a8add7ec10181aad81b0 100644 --- a/modules/Portal/views/List.php +++ b/modules/Portal/views/List.php @@ -40,7 +40,10 @@ class Portal_List_View extends Vtiger_Index_View { public function initializeListViewContents(Vtiger_Request $request, Vtiger_Viewer $viewer) { - if($this->listviewinitcalled == false){ + if($this->listviewinitcalled){ + return; + } + $moduleName = $request->getModule(); $pageNumber = $request->get('page'); $orderBy = $request->get('orderby'); @@ -132,7 +135,6 @@ class Portal_List_View extends Vtiger_Index_View { $this->listviewinitcalled = true; } - } function getHeaderScripts(Vtiger_Request $request) { $headerScriptInstances = parent::getHeaderScripts($request); $moduleName = $request->getModule(); diff --git a/modules/Reports/views/List.php b/modules/Reports/views/List.php index 5eac8e4fd2d4ccd200a9f6ac274c2c59aec9b08b..9d4a01e02d16cc21c1f93e20f3ac5956b6b621fc 100644 --- a/modules/Reports/views/List.php +++ b/modules/Reports/views/List.php @@ -100,7 +100,9 @@ class Reports_List_View extends Vtiger_Index_View { public function initializeListViewContents(Vtiger_Request $request) { - if($this->listviewinitcalled == false){ + if($this->listviewinitcalled){ + return; + } $moduleName = $request->getModule(); $viewer = $this->getViewer($request); $moduleModel = Vtiger_Module_Model::getInstance($moduleName); @@ -238,8 +240,7 @@ class Reports_List_View extends Vtiger_Index_View { } $viewer->assign('DASHBOARD_TABS', $activeTabs); - $this->listviewinitcalled=true; - } + $this->listviewinitcalled=true; // to make a early exit if it is called more than once } /** diff --git a/modules/Settings/Vtiger/views/List.php b/modules/Settings/Vtiger/views/List.php index 234d1ca021a60a142955fe66f7f2ee0a87900e83..b4a265c199dc41e7a9baa6cb46bffad45ccedea3 100644 --- a/modules/Settings/Vtiger/views/List.php +++ b/modules/Settings/Vtiger/views/List.php @@ -38,7 +38,9 @@ class Settings_Vtiger_List_View extends Settings_Vtiger_Index_View { */ public function initializeListViewContents(Vtiger_Request $request, Vtiger_Viewer $viewer) { - if($this->listviewinitcalled ==false){ + if($this->listviewinitcalled){ + return; + } $moduleName = $request->getModule(); $qualifiedModuleName = $request->getModule(false); $pageNumber = $request->get('page'); @@ -139,9 +141,8 @@ class Settings_Vtiger_List_View extends Settings_Vtiger_Index_View { $viewer->assign('LISTVIEW_COUNT', $totalCount); } - $this->listviewinitcalled =true; + $this->listviewinitcalled =true; // to make a early exit if it is called more than once } -} public function postProcess(Vtiger_Request $request) { $viewer = $this->getViewer($request); diff --git a/modules/Vtiger/views/FindDuplicates.php b/modules/Vtiger/views/FindDuplicates.php index c03bb6af8b1fb56ac9b29f679d27300024bad75d..8fd57af1f1d9d9a5b6315f915ee84962aba23490 100644 --- a/modules/Vtiger/views/FindDuplicates.php +++ b/modules/Vtiger/views/FindDuplicates.php @@ -58,7 +58,9 @@ class Vtiger_FindDuplicates_View extends Vtiger_List_View { */ public function initializeListViewContents(Vtiger_Request $request, Vtiger_Viewer $viewer) { - if($this->listviewinitcalled == false){ + if($this->listviewinitcalled){ + return; + } $currentUser = vglobal('current_user'); $viewer = $this->getViewer ($request); $module = $request->getModule(); @@ -124,9 +126,8 @@ class Vtiger_FindDuplicates_View extends Vtiger_List_View { $customViewModel = CustomView_Record_Model::getAllFilterByModule($module); $viewer->assign('VIEW_NAME', $customViewModel->getId()); - $this->listviewinitcalled = true; + $this->listviewinitcalled = true; // to make a early exit if it is called more than once } -} /** * Function returns the number of records for the current filter diff --git a/modules/Vtiger/views/List.php b/modules/Vtiger/views/List.php index 9a37df8b5aeffd553da975d3b8403c9559f6ab89..09045baa05965c32548680ee4ce40c2e626067fd 100644 --- a/modules/Vtiger/views/List.php +++ b/modules/Vtiger/views/List.php @@ -161,7 +161,9 @@ class Vtiger_List_View extends Vtiger_Index_View { */ public function initializeListViewContents(Vtiger_Request $request, Vtiger_Viewer $viewer) { - if($this->listviewinitcalled == false){ + if($this->listviewinitcalled){ + return; + } $moduleName = $request->getModule(); $cvId = $this->viewName; $pageNumber = $request->get('page'); @@ -439,9 +441,8 @@ class Vtiger_List_View extends Vtiger_Index_View { $picklistDependencyDatasource = Vtiger_DependencyPicklist::getPicklistDependencyDatasource($moduleName); $viewer->assign('PICKIST_DEPENDENCY_DATASOURCE',Zend_Json::encode($picklistDependencyDatasource)); - $this->listviewinitcalled = true; + $this->listviewinitcalled = true; // to make a early exit if it is called more than once } -} protected function assignCustomViews(Vtiger_Request $request, Vtiger_Viewer $viewer) { $allCustomViews = CustomView_Record_Model::getAllByGroup($request->getModule()); diff --git a/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/views/List.php b/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/views/List.php index 9acf159c8f27a0e66a9149d4b0b05451139daa69..caa1b09bf14d72c4fa605c205d052e8d08fce069 100644 --- a/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/views/List.php +++ b/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/views/List.php @@ -87,7 +87,9 @@ class EmailTemplates_List_View extends Vtiger_Index_View { */ public function initializeListViewContents(Vtiger_Request $request, Vtiger_Viewer $viewer) { - if($this->listviewinitcalled == false){ + if($this->listviewinitcalled){ + return; + } $moduleName = $request->getModule(); $cvId = $request->get('viewname'); $viewType = $request->get('viewType'); @@ -226,9 +228,8 @@ class EmailTemplates_List_View extends Vtiger_Index_View { $viewer->assign('IS_MODULE_EDITABLE', $listViewModel->getModule()->isPermitted('EditView')); $viewer->assign('IS_MODULE_DELETABLE', $listViewModel->getModule()->isPermitted('Delete')); - $this->listviewinitcalled = true; + $this->listviewinitcalled = true; // to make a early exit if it is called more than once } -} /** * Function returns the number of records for the current filter diff --git a/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/views/List.php b/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/views/List.php index 5b61b4e0fb6dedd82571a2d535061201cf6d46ed..435a61ce03a86113ea6286be57c91bd0f8490028 100644 --- a/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/views/List.php +++ b/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/views/List.php @@ -71,7 +71,9 @@ class RecycleBin_List_View extends Vtiger_Index_View { */ public function initializeListViewContents(Vtiger_Request $request, Vtiger_Viewer $viewer) { - if($this-> listviewinitcalled == false){ + if($this-> listviewinitcalled){ + return; + } $moduleName = $request->getModule(); $sourceModule = $request->get('sourceModule'); @@ -222,10 +224,9 @@ class RecycleBin_List_View extends Vtiger_Index_View { } $viewer->assign('IS_MODULE_DELETABLE', $listViewModel->getModule()->isPermitted('Delete')); - $this-> listviewinitcalled = true; + $this-> listviewinitcalled = true; // to make a early exit if it is called more than once } -} /** * Function to get the list of Script models to be included