Skip to content
Snippets Groups Projects
Commit c681a55a authored by Uma's avatar Uma
Browse files

Fixes clear search should not be available on tag selection

parent 374952c3
No related branches found
No related tags found
1 merge request!663Fixes clear search should not be available on tag selection
......@@ -31,6 +31,7 @@
<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">
......
......@@ -180,9 +180,9 @@ class Documents_List_View extends Vtiger_List_View {
$tagParams = array();
}
$searchParams = array_merge($searchParams, $tagParams);
$searchAndTagParams = array_merge($searchParams, $tagParams);
$transformedSearchParams = $this->transferListSearchParamsToFilterCondition($searchParams, $listViewModel->getModule());
$transformedSearchParams = $this->transferListSearchParamsToFilterCondition($searchAndTagParams, $listViewModel->getModule());
$listViewModel->set('search_params',$transformedSearchParams);
......@@ -196,6 +196,15 @@ class Documents_List_View extends Vtiger_List_View {
}
}
foreach($tagParams as $fieldListGroup){
foreach($fieldListGroup as $fieldSearchInfo){
$fieldSearchInfo['searchValue'] = $fieldSearchInfo[2];
$fieldSearchInfo['fieldName'] = $fieldName = $fieldSearchInfo[0];
$fieldSearchInfo['comparator'] = $fieldSearchInfo[1];
$tagParams[$fieldName] = $fieldSearchInfo;
}
}
$folderId = $request->get('folder_id');
$folderValue = $request->get('folder_value');
......@@ -280,6 +289,7 @@ class Documents_List_View extends Vtiger_List_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('LIST_VIEW_MODEL', $listViewModel);
$viewer->assign('NO_SEARCH_PARAMS_CACHE', $request->get('nolistcache'));
$viewer->assign('VIEWID', $cvId);
......
......@@ -214,6 +214,11 @@ class Vtiger_List_View extends Vtiger_Index_View {
$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'];
......@@ -222,6 +227,9 @@ class Vtiger_List_View extends Vtiger_Index_View {
$searchKey = $orderParams['search_key'];
$searchValue = $orderParams['search_value'];
$operator = $orderParams['operator'];
if(empty($tagParams)){
$tagParams = $orderParams['tag_params'];
}
if(empty($searchParams)) {
$searchParams = $orderParams['search_params'];
}
......@@ -298,9 +306,9 @@ class Vtiger_List_View extends Vtiger_Index_View {
$tagParams = array();
}
$searchParams = array_merge($searchParams, $tagParams);
$searchAndTagParams = array_merge($searchParams, $tagParams);
$transformedSearchParams = $this->transferListSearchParamsToFilterCondition($searchParams, $listViewModel->getModule());
$transformedSearchParams = $this->transferListSearchParamsToFilterCondition($searchAndTagParams, $listViewModel->getModule());
$listViewModel->set('search_params',$transformedSearchParams);
......@@ -411,6 +419,7 @@ 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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment