Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Change maxVersion bizVersion proVersion to edition.

Browse Source
This commit is contained in:
liumengyi
2022-02-24 16:15:08 +08:00
parent bdaf8ced98
commit e0814cd74b
33 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/control.php
+1 -1
View File
@@ -611,7 +611,7 @@ class program extends control
}
}
if(isset($this->config->bizVersion)) list($fields, $projectStats) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $projectStats);
if(isset($this->config->edition == 'biz')) list($fields, $projectStats) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $projectStats);
$this->post->set('fields', $fields);
$this->post->set('rows', $programs);
module/program/view/browsebylist.html.php
+1 -1
View File
@@ -53,7 +53,7 @@
<?php
$icon = '';
if($program->type == 'program') $icon = ' icon-program';
if($program->type == 'project') $icon = ' icon-common icon-' . (isset($this->config->maxVersion) ? $program->model : $program->type);
if($program->type == 'project') $icon = ' icon-common icon-' . ($this->config->edition == 'max' ? $program->model : $program->type);
$class = $program->type == 'program' ? ' table-nest-toggle' : '';
?>
<span class="table-nest-icon icon <?php echo $class . $icon;?>"></span>
module/programplan/model.php
+3 -3
View File
@@ -516,7 +516,7 @@ class programplanModel extends model
foreach($datas as $data)
{
/* Set planDuration and realDuration. */
if(isset($this->config->maxVersion))
if($this->config->edition == 'max')
{
$data->planDuration = $this->getDuration($data->begin, $data->end);
$data->realDuration = $this->getDuration($data->realBegan, $data->realEnd);
@@ -710,7 +710,7 @@ class programplanModel extends model
}
/* Set planDuration and realDuration. */
if(isset($this->config->maxVersion))
if($this->config->edition == 'max')
{
$plan->planDuration = $this->getDuration($plan->begin, $plan->end);
$plan->realDuration = $this->getDuration($plan->realBegan, $plan->realEnd);
@@ -779,7 +779,7 @@ class programplanModel extends model
if($id == 'actions') $class .= ' c-actions';
echo "<td class='{$class}' {$title}>";
if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFlowCell('programplan', $plan, $id);
if($this->config->edition == 'biz') $this->loadModel('flow')->printFlowCell('programplan', $plan, $id);
switch($id)
{
case 'id':
module/programplan/view/create.html.php
+5 -5
View File
@@ -66,7 +66,7 @@
<th class='c-date required'><?php echo $lang->programplan->end;?></th>
<th class='c-date <?php echo zget($visibleFields, 'realBegan', ' hidden') . zget($requiredFields, 'realBegan', '', ' required');?>'><?php echo $lang->programplan->realBegan;?></th>
<th class='c-date <?php echo zget($visibleFields, 'realEnd', ' hidden') . zget($requiredFields, 'realEnd', '', ' required');?>'><?php echo $lang->programplan->realEnd;?></th>
<?php if(isset($this->config->qcVersion)):?>
<?php if($this->config->edition == 'max'):?>
<th class='w-110px'><?php echo $lang->programplan->output;?></th>
<?php endif;?>
<th class="c-action text-center w-110px"> <?php echo $lang->actions;?></th>
@@ -92,7 +92,7 @@
<td><input type='text' name='end[<?php echo $i;?>]' id='end<?php echo $i;?>' value='' class='form-control form-date' /></td>
<td <?php echo zget($visibleFields, 'realBegan', ' hidden') . zget($requiredFields, 'realBegan', '', ' required');?>><input type='text' name='realBegan[<?php echo $i;?>]' id='realBegan<?php echo $i;?>' value='' class='form-control form-date' /></td>
<td <?php echo zget($visibleFields, 'realEnd', ' hidden') . zget($requiredFields, 'realEnd', '', ' required');?>><input type='text' name='realEnd[<?php echo $i;?>]' id='realEnd<?php echo $i;?>' value='' class='form-control form-date' /></td>
<?php if(isset($this->config->qcVersion)):?>
<?php if($this->config->edition == 'max'):?>
<td><?php echo html::select("output[$i][]", $documentList, '', "class='form-control chosen' multiple");?></td>
<?php endif;?>
<td class='c-actions text-left'>
@@ -123,7 +123,7 @@
<td><input type='text' name='end[<?php echo $i;?>]' id='end<?php echo $i;?>' value='<?php echo $plan->end;?>' class='form-control form-date' /></td>
<td <?php echo zget($visibleFields, 'realBegan', ' hidden') . zget($requiredFields, 'realBegan', '', ' required');?>><input type='text' name='realBegan[<?php echo $i;?>] ' id='realBegan<?php echo $i;?>' value='<?php echo $plan->realBegan;?>' class='form-control form-date' /></td>
<td <?php echo zget($visibleFields, 'realEnd', ' hidden') . zget($requiredFields, 'realEnd', '', ' required');?>><input type='text' name='realEnd[<?php echo $i;?>]' id='realEnd<?php echo $i;?>' value='<?php echo $plan->realEnd;?>' class='form-control form-date' /></td>
<?php if(isset($this->config->qcVersion)):?>
<?php if($this->config->edition == 'max'):?>
<?php $option = empty($plan->output) ? 0 : explode(',', $plan->output);?>
<td><?php echo html::select("output[$i][]", $documentList, $option, "class='form-control chosen' multiple");?></td>
<?php endif;?>
@@ -151,7 +151,7 @@
<td><input type='text' name='end[<?php echo $i;?>]' id='end<?php echo $i;?>' value='' class='form-control form-date' /></td>
<td <?php echo zget($visibleFields, 'realBegan', ' hidden') . zget($requiredFields, 'realBegan', '', ' required');?>><input type='text' name='realBegan[<?php echo $i;?>] ' id='realBegan<?php echo $i;?>' value='' class='form-control form-date' /></td>
<td <?php echo zget($visibleFields, 'realEnd', ' hidden') . zget($requiredFields, 'realEnd', '', ' required');?>><input type='text' name='realEnd[<?php echo $i;?>]' id='realEnd<?php echo $i;?>' value='' class='form-control form-date' /></td>
<?php if(isset($this->config->qcVersion)):?>
<?php if($this->config->edition == 'max'):?>
<td><?php echo html::select("output[$i][]", $documentList, '', "class='form-control chosen' multiple");?></td>
<?php endif;?>
<td class='c-actions text-left'>
@@ -193,7 +193,7 @@
<td><input type='text' name='<?php echo "end[$i]";?>' id='end<?php echo $i;?>' class='form-control form-date' /></td>
<td <?php echo zget($visibleFields, 'realBegan', ' hidden') . zget($requiredFields, 'realBegan', '', ' required');?>><input type='text' name='<?php echo "realBegan[$i]";?>' id='realBegan<?php echo $i;?>' class='form-control form-date' /></td>
<td <?php echo zget($visibleFields, 'realEnd', ' hidden') . zget($requiredFields, 'realEnd', '', ' required');?>><input type='text' name='<?php echo "realEnd[$i]";?>' id='realEnd<?php echo $i;?>' class='form-control form-date' /></td>
<?php if(isset($this->config->qcVersion)):?>
<?php if($this->config->edition == 'max'):?>
<td><?php echo html::select("output[$i][]", $documentList, '', "class='form-control chosen ' multiple");?></td>
<?php endif;?>
<td class='c-actions'>
module/project/config.php
+1 -1
View File
@@ -141,4 +141,4 @@ $config->project->excludedPriv['doc'] = array('browse', 'view', 'catalog'
$config->project->excludedPriv['repo'] = array('edit', 'delete', 'maintain', 'setRules');
$config->project->excludedPriv['testreport'] = array('browse');
$config->project->excludedPriv['auditplan'] = array('delete');
if(!isset($config->maxVersion)) $config->project->excludedPriv['stakeholder'] = array('issue', 'viewIssue', 'userIssue');
if($this->config->edition != 'max') $config->project->excludedPriv['stakeholder'] = array('issue', 'viewIssue', 'userIssue');
module/project/control.php
+2 -2
View File
@@ -76,7 +76,7 @@ class project extends control
}
}
if(isset($this->config->bizVersion)) list($fields, $projectStats) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $projectStats);
if($this->config->edition == 'biz') list($fields, $projectStats) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $projectStats);
$this->post->set('fields', $fields);
$this->post->set('rows', $projects);
@@ -832,7 +832,7 @@ class project extends control
$this->session->set('testtaskList', $uri, 'qa');
$this->session->set('reportList', $uri, 'qa');
if(isset($this->config->maxVersion))
if($this->config->edition == 'max')
{
$this->session->set('riskList', $uri, 'project');
$this->session->set('issueList', $uri, 'project');
module/project/model.php
+2 -2
View File
@@ -1631,7 +1631,7 @@ class projectModel extends model
if($id == 'surplus') $title = "title='{$project->hours->totalLeft} {$this->lang->execution->workHour}'";
echo "<td class='$class' $title>";
if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFlowCell('project', $project, $id);
if($this->config->edition == 'biz') $this->loadModel('flow')->printFlowCell('project', $project, $id);
switch($id)
{
case 'id':
@@ -2197,7 +2197,7 @@ class projectModel extends model
public function checkCanChangeModel($projectID, $model)
{
$checkList = $this->config->project->checkList->$model;
if(isset($this->config->maxVersion)) $checkList = $this->config->project->maxCheckList->$model;
if($this->config->edition == 'max') $checkList = $this->config->project->maxCheckList->$model;
foreach($checkList as $module)
{
if($module == '') continue;
module/report/control.php
+1 -1
View File
@@ -33,7 +33,7 @@ class report extends control
$this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
if(!$this->projectID) $this->lang->navGroup->report = 'report';
if((isset($this->config->proVersion) || isset($this->config->bizVersion)) && $this->lang->navGroup->report == 'report' && common::hasPriv('report', 'custom')) $this->lang->report->mainMenuAction = html::a(helper::createLink('report', 'custom'), $this->lang->crystal->custom, '', "class='btn btn-link'");
if($this->config->edition != 'open' && $this->lang->navGroup->report == 'report' && common::hasPriv('report', 'custom')) $this->lang->report->mainMenuAction = html::a(helper::createLink('report', 'custom'), $this->lang->crystal->custom, '', "class='btn btn-link'");
}
/**
module/report/view/blockreportlist.html.php
+1 -1
View File
@@ -21,7 +21,7 @@
</div>
</div>
</div>
<?php if(!isset($config->proVersion) and !isset($config->bizVersion) and !isset($config->maxVersion)):?>
<?php if($this->config->edition == 'open'):?>
<div class='panel panel-body' style='padding: 10px 6px'>
<div class='text proversion'>
<strong class='text-danger small text-latin'>BIZ</strong> &nbsp;<span class='text-important'><?php echo (!empty($config->isINT)) ? $lang->report->proVersionEn : $lang->report->proVersion;?></span>
module/report/view/bugassign.html.php
+1 -1
View File
@@ -1,5 +1,5 @@
<?php include '../../common/view/header.html.php';?>
<?php if(isset($config->maxVersion) or isset($config->proVersion) or isset($config->bizVersion)):?>
<?php if($this->config->edition != 'open'):?>
<style>#mainContent > .side-col.col-lg{width: 235px}</style>
<style>.hide-sidebar #sidebar{width: 0 !important}</style>
<?php endif;?>
module/report/view/bugcreate.html.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php if(isset($config->maxVersion) or isset($config->proVersion) or isset($config->bizVersion)):?>
<?php if($this->config->edition != 'open'):?>
<style>#mainContent > .side-col.col-lg{width: 235px}</style>
<style>.hide-sidebar #sidebar{width: 0 !important}</style>
<?php endif;?>
module/report/view/productsummary.html.php
+1 -1
View File
@@ -2,7 +2,7 @@
<?php if(common::checkNotCN()):?>
<style>#conditions .col-xs { width: 126px; }</style>
<?php endif;?>
<?php if(isset($config->maxVersion) or isset($config->proVersion) or isset($config->bizVersion)):?>
<?php if($this->config->edition != 'open'):?>
<style>#mainContent > .side-col.col-lg{width: 235px}</style>
<style>.hide-sidebar #sidebar{width: 0 !important}</style>
<?php endif;?>
module/report/view/projectdeviation.html.php
+1 -1
View File
@@ -1,7 +1,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/chart.html.php';?>
<?php if(isset($config->maxVersion) or isset($config->proVersion) or isset($config->bizVersion)):?>
<?php if($this->config->edition != 'open'):?>
<style>#mainContent > .side-col.col-lg{width: 235px}</style>
<style>.hide-sidebar #sidebar{width: 0 !important}</style>
<?php endif;?>
module/report/view/workload.html.php
+2 -2
View File
@@ -1,6 +1,6 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php if(isset($config->maxVersion) or isset($config->proVersion) or isset($config->bizVersion)):?>
<?php if($this->config->edition != 'open'):?>
<style>#mainContent > .side-col.col-lg{width: 210px}</style>
<style>.hide-sidebar #sidebar{width: 0 !important}</style>
<?php endif;?>
@@ -89,7 +89,7 @@
<?php if(!isset($users[$account])) continue;?>
<tr class="text-center">
<?php $userTimes = 1; $userCount = 0;?>
<?php foreach($load['task']['project'] as $projectName => $info) foreach($info['execution'] as $executionName => $executionInfo) $userCount ++;?>
<?php foreach($load['task']['project'] as $projectName => $info) foreach($info['execution'] as $executionName => $executionInfo) $userCount ++;?>
<td class="<?php echo $class;?>" rowspan="<?php echo $userCount;?>"><?php echo $users[$account];?></td>
<?php foreach($load['task']['project'] as $projectName => $info):?>
<?php $projectTimes = 1; $projectCount = 0;?>
module/search/control.php
+1 -1
View File
@@ -20,7 +20,7 @@ class search extends control
public function __construct($module = '', $method = '')
{
parent::__construct($module, $method);
if(!isset($this->config->maxVersion)) unset($this->lang->search->modules['effort']);
if($this->config->edition != 'max') unset($this->lang->search->modules['effort']);
if($this->config->systemMode != 'new') unset($this->lang->search->modules['program'], $this->lang->search->modules['project']);
}
module/search/model.php
+6 -6
View File
@@ -24,7 +24,7 @@ class searchModel extends model
public function setSearchParams($searchConfig)
{
$module = $searchConfig['module'];
if(isset($this->config->bizVersion))
if($this->config->edition == 'biz')
{
$flowModule = $module;
if($module == 'projectStory') $flowModule = 'story';
@@ -603,7 +603,7 @@ class searchModel extends model
}
elseif($module == 'issue')
{
$issueField = isset($this->config->maxVersion)? 'id,project,owner,lib' : 'id,project,owner';
$issueField = $this->config->edition == 'max' ? 'id,project,owner,lib' : 'id,project,owner';
$issue = $this->dao->select($issueField)->from(TABLE_ISSUE)->where('id')->eq($record->objectID)->fetch();
if(!empty($issue->lib))
{
@@ -629,7 +629,7 @@ class searchModel extends model
}
elseif($module == 'story')
{
$storyField = isset($this->config->maxVersion)? 'id,type,lib' : 'id,type';
$storyField = $this->config->edition == 'max' ? 'id,type,lib' : 'id,type';
$story = $this->dao->select($storyField)->from(TABLE_STORY)->where('id')->eq($record->objectID)->fetch();
if(!empty($story->lib))
{
@@ -643,7 +643,7 @@ class searchModel extends model
$record->extraType = isset($story->type) ? $story->type : '';
}
elseif(($module == 'risk' or $module == 'opportunity') and isset($this->config->maxVersion))
elseif(($module == 'risk' or $module == 'opportunity') and $this->config->edition == 'max')
{
$table = $this->config->objectTables[$module];
$object = $this->dao->select('id,lib')->from($table)->where('id')->eq($record->objectID)->fetch();
@@ -655,7 +655,7 @@ class searchModel extends model
$record->url = helper::createLink($module, $method, "id={$record->objectID}", '', false, 0, true);
}
elseif($module == 'doc' and isset($this->config->maxVersion))
elseif($module == 'doc' and $this->config->edition == 'max')
{
$doc = $this->dao->select('id,assetLib,assetLibType')->from(TABLE_DOC)->where('id')->eq($record->objectID)->fetch();
if(!empty($doc->assetLib))
@@ -688,7 +688,7 @@ class searchModel extends model
$fields = $this->config->search->fields->{$objectType};
if(empty($fields)) return true;
if($objectType == 'doc' && isset($this->config->bizVersion)) $object = $this->appendFiles($object);
if($objectType == 'doc' && $this->config->edition == 'biz') $object = $this->appendFiles($object);
$index = new stdclass();
$index->objectID = $object->{$fields->id};
module/stakeholder/view/browse.html.php
+1 -1
View File
@@ -78,7 +78,7 @@
<?php
common::printIcon('stakeholder', 'communicate', "id=$stakeholder->id", $stakeholder, 'list', 'chat-line', '', 'iframe', 'yes');
common::printIcon('stakeholder', 'expect', "id=$stakeholder->id", $stakeholder, 'list', 'flag', '', 'iframe', 'yes');
if(isset($config->maxVersion) and $stakeholder->projectModel == 'waterfall') common::printIcon('stakeholder', 'userIssue', "account=$stakeholder->id", $stakeholder, 'list', 'list-alt', '', 'iframe', 'yes');
if($this->config->edition == 'max' and $stakeholder->projectModel == 'waterfall') common::printIcon('stakeholder', 'userIssue', "account=$stakeholder->id", $stakeholder, 'list', 'list-alt', '', 'iframe', 'yes');
common::printIcon('stakeholder', 'edit', "id=$stakeholder->id", $stakeholder, 'list', '', '', '', '');
$deleteClass = common::hasPriv('stakeholder', 'delete') ? 'btn' : 'btn disabled';
echo html::a($this->createLink('stakeholder', 'delete', "id=$stakeholder->id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->stakeholder->delete}' class='{$deleteClass}'");
module/story/control.php
+1 -1
View File
@@ -2431,7 +2431,7 @@ class story extends control
}
if(!(in_array('platform', $productsType) or in_array('branch', $productsType))) unset($fields['branch']);// If products's type are normal, unset branch field.
if(isset($this->config->bizVersion)) list($fields, $stories) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $stories);
if($this->config->edition == 'biz') list($fields, $stories) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $stories);
$this->post->set('fields', $fields);
$this->post->set('rows', $stories);
module/story/model.php
+5 -5
View File
@@ -2902,7 +2902,7 @@ class storyModel extends model
->beginIF($type == 'reviewedBy')->andWhere("CONCAT(',', reviewedBy, ',')")->like("%,$account,%")->fi()
->beginIF($type == 'closedBy')->andWhere('closedBy')->eq($account)->fi()
->fi()
->beginIF($includeLibStories == false and isset($this->config->maxVersion))->andWhere('t1.lib')->eq('0')->fi()
->beginIF($includeLibStories == false and $this->config->edition == 'max')->andWhere('t1.lib')->eq('0')->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll('id');
@@ -3821,7 +3821,7 @@ class storyModel extends model
}
echo "<td class='" . $class . "' title='$title' style='$style'>";
if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFlowCell('story', $story, $id);
if($this->config->edition == 'biz') $this->loadModel('flow')->printFlowCell('story', $story, $id);
switch($id)
{
case 'id':
@@ -4119,7 +4119,7 @@ class storyModel extends model
$stories[$id]->cases = $this->loadModel('testcase')->getStoryCases($id);
$stories[$id]->bugs = $this->loadModel('bug')->getStoryBugs($id);
$stories[$id]->tasks = $this->loadModel('task')->getStoryTasks($id);
if(isset($this->config->maxVersion))
if($this->config->edition == 'max')
{
$stories[$id]->designs = $this->dao->select('id, name')->from(TABLE_DESIGN)->where('story')->eq($id)->fetchAll('id');
$stories[$id]->revisions = $this->dao->select('BID, extra')->from(TABLE_RELATION)
@@ -4189,7 +4189,7 @@ class storyModel extends model
$stories[$id]->cases = $this->loadModel('testcase')->getStoryCases($id);
$stories[$id]->bugs = $this->loadModel('bug')->getStoryBugs($id);
$stories[$id]->tasks = $this->loadModel('task')->getStoryTasks($id);
if(isset($this->config->maxVersion))
if($this->config->edition == 'max')
{
$stories[$id]->designs = $this->dao->select('id, name')->from(TABLE_DESIGN)->where('story')->eq($id)->fetchAll('id');
$stories[$id]->revisions = $this->dao->select('BID, extra')->from(TABLE_RELATION)
@@ -4229,7 +4229,7 @@ class storyModel extends model
$track[$id]->bug = $this->loadModel('bug')->getStoryBugs($id);
$track[$id]->story = $this->getByID($id);
$track[$id]->task = $this->loadModel('task')->getStoryTasks($id);
if(isset($this->config->maxVersion))
if($this->config->edition == 'max')
{
$track[$id]->design = $this->dao->select('id, name')->from(TABLE_DESIGN)->where('story')->eq($id)->fetchAll('id');
$track[$id]->revision = $this->dao->select('BID, extra')->from(TABLE_RELATION)->where('AType')->eq('design')->andWhere('BType')->eq('commit')->andWhere('AID')->in(array_keys($track[$id]->design))->fetchPairs();
module/story/view/track.html.php
+4 -4
View File
@@ -42,11 +42,11 @@
<?php endif;?>
<th><?php echo $lang->story->story;?></th>
<th><?php echo $lang->story->tasks;?></th>
<?php if(isset($config->maxVersion)):?>
<?php if($config->edition == 'max'):?>
<th><?php echo $lang->story->design;?></th>
<?php endif;?>
<th><?php echo $lang->story->case;?></th>
<?php if(isset($config->maxVersion)):?>
<?php if($config->edition == 'max'):?>
<th><?php echo $lang->story->repoCommit;?></th>
<?php endif;?>
<th><?php echo $lang->story->bug;?></th>
@@ -78,7 +78,7 @@
<?php echo html::a($this->createLink('task', 'view', "taskID=$taskID"), $task->name, '', "title='$task->name'") . '<br/>';?>
<?php endforeach;?>
</td>
<?php if(isset($config->maxVersion)):?>
<?php if($config->edition == 'max'):?>
<td>
<?php foreach($story->designs as $designID => $design):?>
<?php echo html::a($this->createLink('design', 'view', "designID=$designID"), $design->name, '', "title='$design->name'") . '<br/>';?>
@@ -90,7 +90,7 @@
<?php echo html::a($this->createLink('testcase', 'view', "caseID=$caseID"), $case->title, '', "title='$case->title'") . '<br/>';?>
<?php endforeach;?>
</td>
<?php if(isset($config->maxVersion)):?>
<?php if($config->edition == 'max'):?>
<td>
<?php foreach($story->revisions as $revision => $repoID):?>
<?php
module/story/view/view.html.php
+1 -1
View File
@@ -215,7 +215,7 @@
common::printIcon('story', 'assignTo', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('story', 'close', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('story', 'activate', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true);
if(isset($this->config->maxVersion) and $this->app->tab == 'project' and common::hasPriv('story', 'importToLib')) echo html::a('#importToLib', "<i class='icon icon-assets'></i> " . $this->lang->story->importToLib, '', 'class="btn" data-toggle="modal"');
if($this->config->edition == 'max' and $this->app->tab == 'project' and common::hasPriv('story', 'importToLib')) echo html::a('#importToLib', "<i class='icon icon-assets'></i> " . $this->lang->story->importToLib, '', 'class="btn" data-toggle="modal"');
if($story->parent >= 0 and $story->type != 'requirement' and (common::hasPriv('testcase', 'create', $story) or common::hasPriv('testcase', 'batchCreate', $story)))
{
module/task/control.php
+1 -1
View File
@@ -1920,7 +1920,7 @@ class task extends control
}
}
}
if(isset($this->config->bizVersion)) list($fields, $tasks) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $tasks);
if($this->config->edition == 'biz') list($fields, $tasks) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $tasks);
$this->post->set('fields', $fields);
$this->post->set('rows', $tasks);
module/task/model.php
+6 -6
View File
@@ -2118,15 +2118,15 @@ class taskModel extends model
if($task->parent > 0) $parents[$task->parent] = $task->parent;
}
$parents = $this->dao->select('*')->from(TABLE_TASK)->where('id')->in($parents)->fetchAll('id');
$lanes = array();
$cardsWhere = '';
foreach($tasks as $task)
foreach($tasks as $task)
{
if(empty($cardsWhere))
if(empty($cardsWhere))
{
$cardsWhere = "cards like '%,{$task->id},%'";
}
}
else
{
$cardsWhere .= " or cards like '%,{$task->id},%'";
@@ -2158,7 +2158,7 @@ class taskModel extends model
$task->lane = '';
if(!empty($lanes))
{
foreach($lanes as $lane)
foreach($lanes as $lane)
{
if(strpos($lane->cards, $task->id) !== false) $task->lane = $lane->name;
}
@@ -3147,7 +3147,7 @@ class taskModel extends model
}
echo "<td class='" . $class . "'" . $title . ">";
if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFlowCell('task', $task, $id);
if($this->config->edition == 'biz') $this->loadModel('flow')->printFlowCell('task', $task, $id);
switch($id)
{
case 'id':
module/testcase/control.php
+1 -1
View File
@@ -1593,7 +1593,7 @@ class testcase extends control
}
}
}
if(isset($this->config->bizVersion)) list($fields, $cases) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $cases);
if($this->config->edition == 'biz') list($fields, $cases) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $cases);
$this->post->set('fields', $fields);
$this->post->set('rows', $cases);
module/testcase/model.php
+1 -1
View File
@@ -1535,7 +1535,7 @@ class testcaseModel extends model
if(strpos(',stage,precondition,keywords,story,', ",{$id},") !== false) $class .= ' text-ellipsis';
echo "<td class='{$class}' {$title}>";
if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFlowCell('testcase', $case, $id);
if($this->config->edition == 'biz') $this->loadModel('flow')->printFlowCell('testcase', $case, $id);
switch($id)
{
case 'id':
module/testtask/control.php
+1 -1
View File
@@ -157,7 +157,7 @@ class testtask extends control
$this->lang->scrum->menu->qa['subMenu']->testcase['subModule'] = 'testtask';
$this->lang->scrum->menu->qa['subMenu']->testtask['subModule'] = '';
if(isset($this->config->maxVersion))
if($this->config->edition == 'max')
{
$this->lang->waterfall->menu->qa['subMenu']->testcase['subModule'] = 'testtask';
$this->lang->waterfall->menu->qa['subMenu']->testtask['subModule'] = '';
module/testtask/model.php
+1 -1
View File
@@ -1414,7 +1414,7 @@ class testtaskModel extends model
if($id == 'actions') $class .= 'c-actions';
echo "<td class='" . $class . "'" . ($id=='title' ? "title='{$run->title}'":'') . ">";
if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFlowCell('testcase', $run, $id);
if($this->config->edition == 'biz') $this->loadModel('flow')->printFlowCell('testcase', $run, $id);
switch ($id)
{
case 'id':
module/todo/control.php
+7 -7
View File
@@ -199,8 +199,8 @@ class todo extends control
$bugs = $this->bug->getUserBugPairs($account);
$tasks = $this->task->getUserTaskPairs($account, $status);
$storys = $this->loadModel('story')->getUserStoryPairs($account);
if(isset($this->config->bizVersion) or isset($this->config->maxVersion)) $this->view->feedbacks = $this->loadModel('feedback')->getUserFeedbackPairs($account);
if(isset($this->config->maxVersion))
if($this->config->edition != 'open') $this->view->feedbacks = $this->loadModel('feedback')->getUserFeedbackPairs($account);
if($this->config->edition == 'max')
{
$issues = $this->loadModel('issue')->getUserIssuePairs($account);
$risks = $this->loadmodel('risk')->getUserRiskPairs($account);
@@ -209,7 +209,7 @@ class todo extends control
$testtasks = $this->loadModel('testtask')->getUserTestTaskPairs($account);
$reviews = array();
if(isset($this->config->qcVersion) or isset($this->config->maxVersion)) $reviews = $this->loadModel('review')->getUserReviewPairs($account);
if($this->config->edition == 'max') $reviews = $this->loadModel('review')->getUserReviewPairs($account);
$allTodos = $this->todo->getList($type, $account, $status);
if($this->post->todoIDList) $todoIDList = $this->post->todoIDList;
@@ -243,7 +243,7 @@ class todo extends control
$this->view->bugs = $bugs;
$this->view->tasks = $tasks;
$this->view->storys = $storys;
if(isset($this->config->maxVersion))
if($this->config->edition == 'max')
{
$this->view->issues = $issues;
$this->view->risks = $risks;
@@ -577,7 +577,7 @@ class todo extends control
$bugs = $this->loadModel('bug')->getUserBugPairs($account);
$stories = $this->loadModel('story')->getUserStoryPairs($account, 100, 'story');
$tasks = $this->loadModel('task')->getUserTaskPairs($account);
if(isset($this->config->maxVersion))
if($this->config->edition == 'max')
{
$issues = $this->loadModel('issue')->getUserIssuePairs($account);
$risks = $this->loadModel('risk')->getUserRiskPairs($account);
@@ -599,7 +599,7 @@ class todo extends control
if($type == 'story') $todo->name = isset($stories[$todo->idvalue]) ? $stories[$todo->idvalue] . "(#$todo->idvalue)" : '';
if($type == 'task') $todo->name = isset($tasks[$todo->idvalue]) ? $tasks[$todo->idvalue] . "(#$todo->idvalue)" : '';
if(isset($this->config->maxVersion))
if($this->config->edition == 'max')
{
if($type == 'issue') $todo->name = isset($issues[$todo->idvalue]) ? $issues[$todo->idvalue] . "(#$todo->idvalue)" : '';
if($type == 'risk') $todo->name = isset($risks[$todo->idvalue]) ? $risks[$todo->idvalue] . "(#$todo->idvalue)" : '';
@@ -617,7 +617,7 @@ class todo extends control
unset($todo->idvalue);
unset($todo->private);
}
if(isset($this->config->bizVersion)) list($fields, $todos) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $todos);
if($this->config->edition == 'biz') list($fields, $todos) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $todos);
$this->post->set('fields', $fields);
$this->post->set('rows', $todos);
module/todo/model.php
+8 -8
View File
@@ -427,10 +427,10 @@ class todoModel extends model
if($todo->type == 'story') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_STORY)->fetch('title');
if($todo->type == 'task') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_TASK)->fetch('name');
if($todo->type == 'bug') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_BUG)->fetch('title');
if($todo->type == 'issue' and isset($this->config->maxVersion)) $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_ISSUE)->fetch('title');
if($todo->type == 'risk' and isset($this->config->maxVersion)) $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_RISK)->fetch('name');
if($todo->type == 'opportunity' and isset($this->config->maxVersion)) $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_OPPORTUNITY)->fetch('name');
if($todo->type == 'review' and isset($this->config->maxVersion)) $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_REVIEW)->fetch('title');
if($todo->type == 'issue' and $this->config->edition == 'max') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_ISSUE)->fetch('title');
if($todo->type == 'risk' and $this->config->edition == 'max') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_RISK)->fetch('name');
if($todo->type == 'opportunity' and $this->config->edition == 'max') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_OPPORTUNITY)->fetch('name');
if($todo->type == 'review' and $this->config->edition == 'max') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_REVIEW)->fetch('title');
if($todo->type == 'testtask') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_TESTTASK)->fetch('name');
$todo->date = str_replace('-', '', $todo->date);
return $todo;
@@ -544,10 +544,10 @@ class todoModel extends model
if($todo->type == 'task') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_TASK)->fetch('name');
if($todo->type == 'bug') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_BUG)->fetch('title');
if($todo->type == 'testtask') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_TESTTASK)->fetch('name');
if($todo->type == 'issue' && isset($this->config->maxVersion)) $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_ISSUE)->fetch('title');
if($todo->type == 'risk' && isset($this->config->maxVersion)) $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_RISK)->fetch('name');
if($todo->type == 'opportunity' && isset($this->config->maxVersion)) $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_OPPORTUNITY)->fetch('name');
if($todo->type == 'review' && isset($this->config->maxVersion)) $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_REVIEW)->fetch('title');
if($todo->type == 'issue' && $this->config->edition == 'max') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_ISSUE)->fetch('title');
if($todo->type == 'risk' && $this->config->edition == 'max') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_RISK)->fetch('name');
if($todo->type == 'opportunity' && $this->config->edition == 'max') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_OPPORTUNITY)->fetch('name');
if($todo->type == 'review' && $this->config->edition == 'max') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_REVIEW)->fetch('title');
$todo->begin = date::formatTime($todo->begin);
$todo->end = date::formatTime($todo->end);
module/user/model.php
+1 -1
View File
@@ -2627,7 +2627,7 @@ class userModel extends model
$personalData['createdBugs'] = $this->dao->select($count)->from(TABLE_BUG)->where('openedBy')->eq($account)->andWhere('deleted')->eq('0')->fetch('count');
$personalData['resolvedBugs'] = $this->dao->select($count)->from(TABLE_BUG)->where('resolvedBy')->eq($account)->andWhere('deleted')->eq('0')->fetch('count');
$personalData['createdCases'] = $this->dao->select($count)->from(TABLE_CASE)->where('openedBy')->eq($account)->andWhere('deleted')->eq('0')->andWhere('product')->ne(0)->fetch('count');
if(isset($this->config->maxVersion))
if($this->config->edition == 'max')
{
$personalData['createdRisks'] = $this->dao->select($count)->from(TABLE_RISK)->where('createdBy')->eq($account)->andWhere('deleted')->eq('0')->fetch('count');
$personalData['resolvedRisks'] = $this->dao->select($count)->from(TABLE_RISK)->where('resolvedBy')->eq($account)->andWhere('deleted')->eq('0')->fetch('count');
module/user/view/execution.html.php
+1 -1
View File
@@ -35,7 +35,7 @@
<tr>
<td><?php echo html::a($executionLink, $execution->id);?></td>
<td>
<?php if(isset($config->maxVersion)):?>
<?php if($this->config->edition == 'max'):?>
<span class='project-type-label label label-info label-outline'><?php echo zget($lang->user->executionTypeList, $execution->type);?></span>
<?php endif;?>
<?php echo html::a($executionLink, $execution->name);?>
module/user/view/featurebar.html.php
+1 -1
View File
@@ -46,7 +46,7 @@
common::printLink('user', 'execution', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
}
if(isset($this->config->maxVersion))
if($this->config->edition == 'max')
{
$label = "<span class='text'>{$lang->user->issue}</span>";
$active = $methodName == 'issue' ? ' btn-active-text' : '';
module/weekly/model.php
+1 -1
View File
@@ -462,7 +462,7 @@ class weeklyModel extends model
$executions = $this->loadModel('execution')->getList($project, 'all', 'all', 0, 0, 0);
$executionIdList = array_keys($executions);
if(isset($this->config->proVersion))
if($this->config->edition == 'max')
{
$AC = $this->dao->select('sum(consumed) as consumed')
->from(TABLE_EFFORT)