*Finish task 49286.
This commit is contained in:
@@ -103,12 +103,12 @@ class search extends control
|
||||
if($_POST)
|
||||
{
|
||||
$queryID = $this->search->saveQuery();
|
||||
if(!$queryID) die(js::error(dao::getError()));
|
||||
if(!$queryID) return print(js::error(dao::getError()));
|
||||
|
||||
$data = fixer::input('post')->get();
|
||||
$shortcut = empty($data->onMenuBar) ? 0 : 1;
|
||||
|
||||
die(js::closeModal('parent.parent', '', "function(){parent.parent.loadQueries($queryID, $shortcut, '{$data->title}')}"));
|
||||
return print(js::closeModal('parent.parent', '', "function(){parent.parent.loadQueries($queryID, $shortcut, '{$data->title}')}"));
|
||||
}
|
||||
$this->view->module = $module;
|
||||
$this->view->onMenuBar = $onMenuBar;
|
||||
|
||||
@@ -29,6 +29,7 @@ $lang->search->me = 'Me';
|
||||
$lang->search->noQuery = 'No query is saved yet!';
|
||||
$lang->search->onMenuBar = 'Show in Menu';
|
||||
$lang->search->custom = 'Custom';
|
||||
$lang->search->setCommon = 'Set as public query criteria';
|
||||
|
||||
$lang->search->account = 'Account';
|
||||
$lang->search->module = 'Module';
|
||||
|
||||
@@ -29,6 +29,7 @@ $lang->search->me = '自己';
|
||||
$lang->search->noQuery = '还没有保存查询!';
|
||||
$lang->search->onMenuBar = '显示在菜单栏';
|
||||
$lang->search->custom = '自定义';
|
||||
$lang->search->setCommon = '设为公共查询条件';
|
||||
|
||||
$lang->search->account = '用户名';
|
||||
$lang->search->module = '模块';
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
<span class='input-group-addon'>
|
||||
<div class="checkbox-primary">
|
||||
<input type="checkbox" name="common" value="1" id="common" />
|
||||
<label for="common"><?php echo "设为公共搜索条件";?></label>
|
||||
<label for="common"><?php echo $lang->search->setCommon;?></label>
|
||||
</div>
|
||||
</span>
|
||||
<?php if($onMenuBar == 'yes'):?>
|
||||
|
||||
Reference in New Issue
Block a user