* Resolve issue #674.
This commit is contained in:
@@ -83,6 +83,9 @@ class action extends control
|
||||
$this->session->set('practiceLibList', $uri, 'assetlib');
|
||||
$this->session->set('componentLibList', $uri, 'assetlib');
|
||||
|
||||
/* Save the object name used to replace the search language item. */
|
||||
$this->session->set('objectName', zget($this->lang->action->objectTypes, $browseType, ''), 'admin');
|
||||
|
||||
/* Build the search form. */
|
||||
$queryID = (int)$queryID;
|
||||
$actionURL = $this->createLink('action', 'trash', "browseType=$browseType&type=$type&byQuery=true&queryID=myQueryID");
|
||||
|
||||
@@ -50,7 +50,10 @@
|
||||
foreach($moreType as $objectType)
|
||||
{
|
||||
$activeClass = $objectType == $currentObjectType ? 'btn-active-text' : '';
|
||||
echo '<li>' . html::a($this->createLink('action', 'trash', "objectType=$objectType&type=$type"), "<span class='text'>" . zget($lang->action->objectTypes, $objectType) . "</span>", '', "class='btn btn-link $activeClass'") . '</li>';
|
||||
$objectName = zget($lang->action->objectTypes, $objectType, '');
|
||||
if(empty($objectName)) continue;
|
||||
|
||||
echo '<li>' . html::a($this->createLink('action', 'trash', "objectType=$objectType&type=$type"), "<span class='text'>" . $objectName . "</span>", '', "class='btn btn-link $activeClass'") . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
@@ -49,6 +49,8 @@ class search extends control
|
||||
$_SESSION['searchParams']['module'] = $module;
|
||||
$this->search->initSession($module, $fields, $params);
|
||||
|
||||
if($module == 'trash' and $this->session->objectName) $this->lang->search->common = $this->lang->search->common . $this->session->objectName;
|
||||
|
||||
$this->view->module = $module;
|
||||
$this->view->groupItems = $this->config->search->groupItems;
|
||||
$this->view->searchFields = $fields;
|
||||
|
||||
Reference in New Issue
Block a user