diff --git a/layouts/v7/modules/Vtiger/ListViewContents.tpl b/layouts/v7/modules/Vtiger/ListViewContents.tpl index fd813e26f3055c384b7b1b6d8bb8fba53f1d7ca8..0e017a2d14c08860a1d13cfb3d0338ba125e386a 100644 --- a/layouts/v7/modules/Vtiger/ListViewContents.tpl +++ b/layouts/v7/modules/Vtiger/ListViewContents.tpl @@ -31,7 +31,6 @@ <input type='hidden' name="pageLimit" value="{$PAGING_MODEL->getPageLimit()}" id='pageLimit'> <input type="hidden" name="noOfEntries" value="{$LISTVIEW_ENTRIES_COUNT}" id="noOfEntries"> <input type="hidden" name="currentSearchParams" value="{Vtiger_Util_Helper::toSafeHTML(Zend_JSON::encode($SEARCH_DETAILS))}" id="currentSearchParams" /> - <input type="hidden" name="currentTagParams" value="{Vtiger_Util_Helper::toSafeHTML(Zend_JSON::encode($TAG_DETAILS))}" id="currentTagParams" /> <input type="hidden" name="noFilterCache" value="{$NO_SEARCH_PARAMS_CACHE}" id="noFilterCache" > <input type="hidden" name="orderBy" value="{$ORDER_BY}" id="orderBy"> <input type="hidden" name="sortOrder" value="{$SORT_ORDER}" id="sortOrder"> diff --git a/modules/Vtiger/views/List.php b/modules/Vtiger/views/List.php index 7e97088ea15fe92128debf4f80bf46784f15b504..c90ad10e9f6e43be6643d3006f778aaec5bfca67 100644 --- a/modules/Vtiger/views/List.php +++ b/modules/Vtiger/views/List.php @@ -188,16 +188,16 @@ class Vtiger_List_View extends Vtiger_Index_View { Vtiger_ListView_Model::setSortParamsSession($tagSessionKey, $tag); } + if(empty($cvId)) { + $customView = new CustomView(); + $cvId = $customView->getViewId($moduleName); + } + $listViewSessionKey = $moduleName.'_'.$cvId; if(!empty($tag)) { $listViewSessionKey .='_'.$tag; } - if(empty($cvId)) { - $customView = new CustomView(); - $cvId = $customView->getViewId($moduleName); - } - $orderParams = Vtiger_ListView_Model::getSortParamsSession($listViewSessionKey); if($request->get('mode') == 'removeAlphabetSearch') { Vtiger_ListView_Model::deleteParamsSession($listViewSessionKey, array('search_key', 'search_value', 'operator')); @@ -213,11 +213,7 @@ class Vtiger_List_View extends Vtiger_Index_View { if(empty($listHeaders)) { $listHeaders = $orderParams['list_headers']; } - - if(!empty($tag) && empty($tagParams)){ - $tagParams = $orderParams['tag_params']; - } - + if(empty($orderBy) && empty($searchValue) && empty($pageNumber)) { if($orderParams) { $pageNumber = $orderParams['page']; @@ -302,9 +298,9 @@ class Vtiger_List_View extends Vtiger_Index_View { $tagParams = array(); } - $searchAndTagParams = array_merge($searchParams, $tagParams); + $searchParams = array_merge($searchParams, $tagParams); - $transformedSearchParams = $this->transferListSearchParamsToFilterCondition($searchAndTagParams, $listViewModel->getModule()); + $transformedSearchParams = $this->transferListSearchParamsToFilterCondition($searchParams, $listViewModel->getModule()); $listViewModel->set('search_params',$transformedSearchParams); @@ -415,7 +411,6 @@ class Vtiger_List_View extends Vtiger_Index_View { $viewer->assign('IS_MODULE_EDITABLE', $listViewModel->getModule()->isPermitted('EditView')); $viewer->assign('IS_MODULE_DELETABLE', $listViewModel->getModule()->isPermitted('Delete')); $viewer->assign('SEARCH_DETAILS', $searchParams); - $viewer->assign('TAG_DETAILS', $tagParams); $viewer->assign('NO_SEARCH_PARAMS_CACHE', $request->get('nolistcache')); $viewer->assign('STAR_FILTER_MODE',$starFilterMode); $viewer->assign('VIEWID', $cvId);