* Finish task#61182,61168
This commit is contained in:
zenggang
@@ -28,7 +28,6 @@ class program extends control
|
||||
*/
|
||||
public function browse($status = 'all', $orderBy = 'order_asc', $recTotal = 0, $recPerPage = 10, $pageID = 1, $param = 0)
|
||||
{
|
||||
$this->lang->program->featureBar = array('all' => $this->lang->program->featureBar['all']);
|
||||
if(common::hasPriv('program', 'create')) $this->lang->pageActions = html::a($this->createLink('program', 'create'), "<i class='icon icon-plus'></i> " . $this->lang->program->create, '', "class='btn btn-primary create-program-btn'");
|
||||
|
||||
$this->session->set('programList', $this->app->getURI(true), 'program');
|
||||
@@ -54,8 +53,8 @@ class program extends control
|
||||
else
|
||||
{
|
||||
/* Get top programs and projects. */
|
||||
$topObjects = $this->program->getList($status, $orderBy, $pager, 'top');
|
||||
$programs = $this->program->getList($status, $orderBy, NULL, 'child', array_keys($topObjects));
|
||||
$topObjects = $this->program->getList($status == 'unclosed' ? 'doing,suspended,wait' : $status, $orderBy, $pager, 'top');
|
||||
$programs = $this->program->getList($status == 'closed' ? 'closed' : 'all', $orderBy, NULL, 'child', array_keys($topObjects));
|
||||
|
||||
/* Get summary. */
|
||||
$topCount = $indCount = 0;
|
||||
|
||||
@@ -140,7 +140,7 @@ $lang->program->statusList['suspended'] = 'Suspended';
|
||||
$lang->program->statusList['closed'] = 'Closed';
|
||||
|
||||
$lang->program->featureBar['all'] = 'All';
|
||||
$lang->program->featureBar['undone'] = 'Unfinished';
|
||||
$lang->program->featureBar['unclosed'] = 'Unclosed';
|
||||
$lang->program->featureBar['wait'] = 'Waiting';
|
||||
$lang->program->featureBar['doing'] = 'Doing';
|
||||
$lang->program->featureBar['suspended'] = 'Suspended';
|
||||
|
||||
@@ -140,7 +140,7 @@ $lang->program->statusList['suspended'] = 'Suspended';
|
||||
$lang->program->statusList['closed'] = 'Closed';
|
||||
|
||||
$lang->program->featureBar['all'] = 'All';
|
||||
$lang->program->featureBar['undone'] = 'Unfinished';
|
||||
$lang->program->featureBar['unclosed'] = 'Unclosed';
|
||||
$lang->program->featureBar['wait'] = 'Waiting';
|
||||
$lang->program->featureBar['doing'] = 'Doing';
|
||||
$lang->program->featureBar['suspended'] = 'Suspended';
|
||||
|
||||
@@ -140,7 +140,7 @@ $lang->program->statusList['suspended'] = 'Suspended';
|
||||
$lang->program->statusList['closed'] = 'Closed';
|
||||
|
||||
$lang->program->featureBar['all'] = 'All';
|
||||
$lang->program->featureBar['undone'] = 'Non Terminées';
|
||||
$lang->program->featureBar['unclosed'] = 'Unclosed';
|
||||
$lang->program->featureBar['wait'] = 'En Attente';
|
||||
$lang->program->featureBar['doing'] = 'En Cours';
|
||||
$lang->program->featureBar['suspended'] = 'Suspendues';
|
||||
|
||||
@@ -114,6 +114,7 @@ $lang->program->accessDenied = '你无权访问该项目集';
|
||||
$lang->program->beyondParentBudget = '已超出所属项目集的剩余预算';
|
||||
$lang->program->checkedProjects = '已选择%s项';
|
||||
|
||||
|
||||
$lang->program->endList[31] = '一个月';
|
||||
$lang->program->endList[93] = '三个月';
|
||||
$lang->program->endList[186] = '半年';
|
||||
@@ -140,7 +141,7 @@ $lang->program->statusList['suspended'] = '已挂起';
|
||||
$lang->program->statusList['closed'] = '已关闭';
|
||||
|
||||
$lang->program->featureBar['all'] = '所有';
|
||||
$lang->program->featureBar['undone'] = '未完成';
|
||||
$lang->program->featureBar['unclosed'] = '未关闭';
|
||||
$lang->program->featureBar['wait'] = '未开始';
|
||||
$lang->program->featureBar['doing'] = '进行中';
|
||||
$lang->program->featureBar['suspended'] = '已挂起';
|
||||
|
||||
@@ -166,8 +166,8 @@ class programModel extends model
|
||||
->where('type')->in('program,project')
|
||||
->andWhere('deleted')->eq(0)
|
||||
->andWhere('vision')->eq($this->config->vision)
|
||||
->beginIF($status != 'all')->andWhere('status')->eq($status)->fi()
|
||||
->beginIF(!$this->cookie->showClosed)->andWhere('status')->ne('closed')->fi()
|
||||
->beginIF($status != 'all')->andWhere('status')->in($status)->fi()
|
||||
->beginIF(!$this->cookie->showClosed and $status == 'all')->andWhere('status')->ne('closed')->fi()
|
||||
->beginIF($this->app->rawMethod == 'browse' and $type === 'top')->andWhere('parent')->eq(0)->fi()
|
||||
->beginIF($this->app->rawMethod == 'browse' and ($type === 'child' or !$this->app->user->admin))->andWhere('id')->in($objectIdList)->fi()
|
||||
->beginIF(!$this->app->user->admin and $this->app->rawMethod != 'browse')->andWhere('id')->in($userViewIdList)->fi()
|
||||
@@ -742,7 +742,7 @@ class programModel extends model
|
||||
->checkIF($program->begin != '', 'begin', 'date')
|
||||
->checkIF($program->end != '', 'end', 'date')
|
||||
->checkIF($program->end != '', 'end', 'gt', $program->begin)
|
||||
->checkIF(!empty($program->name), 'name', 'unique', "`type`='program' and `parent` = $program->parent")
|
||||
->checkIF(!empty($program->name), 'name', 'unique', "`type`='program' and `parent` = $program->parent and `deleted` = '0'")
|
||||
->checkFlow()
|
||||
->exec();
|
||||
|
||||
@@ -848,7 +848,7 @@ class programModel extends model
|
||||
->checkIF($program->begin != '', 'begin', 'date')
|
||||
->checkIF($program->end != '', 'end', 'date')
|
||||
->checkIF($program->end != '', 'end', 'gt', $program->begin)
|
||||
->checkIF(!empty($program->name), 'name', 'unique', "id!=$programID and `type`='program' and `parent` = $program->parent")
|
||||
->checkIF(!empty($program->name), 'name', 'unique', "id!=$programID and `type`='program' and `parent` = $program->parent and `deleted` = '0'")
|
||||
->checkFlow()
|
||||
->where('id')->eq($programID)
|
||||
->limit(1)
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
<?php $label = "<span class='text'>$label</span>";?>
|
||||
<?php echo html::a(inlink('browse', "status=$key&orderBy=$orderBy"), $label, '', "class='btn btn-link $active'");?>
|
||||
<?php endforeach;?>
|
||||
<?php echo html::checkbox('showClosed', array('1' => $lang->program->showClosed), '', $this->cookie->showClosed ? 'checked=checked' : '');?>
|
||||
<?php if($status == 'all' or $status == 'bySearch') echo html::checkbox('showClosed', array('1' => $lang->program->showClosed), '', $this->cookie->showClosed ? 'checked=checked' : '');?>
|
||||
<?php if(common::hasPriv('project', 'batchEdit') and $programType != 'bygrid' and $hasProject === true) echo html::checkbox('editProject', array('1' => $lang->project->edit), '', $this->cookie->editProject ? 'checked=checked' : '');?>
|
||||
<a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->user->search;?></a>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user