diff --git a/api/v1/entries/productissue.php b/api/v1/entries/productissue.php index eecc5704c4..f6a92de5bb 100644 --- a/api/v1/entries/productissue.php +++ b/api/v1/entries/productissue.php @@ -53,6 +53,7 @@ class productIssueEntry extends entry } break; + case 'bug': $this->app->loadLang('bug'); $bugStatus = array('' => '', 'active' => 'opened', 'resolved' => 'opened', 'closed' => 'closed'); @@ -132,7 +133,9 @@ class productIssueEntry extends entry $this->send404(); } - $actions = $this->loadModel('action')->getList($type, $issueID); + $actions = $this->loadModel('action')->getList($type, $id); + + $issue->comments = array_values($this->processActions($type, $actions)); /** * Get all users in issues so that we can bulk get user detail later. @@ -159,4 +162,52 @@ class productIssueEntry extends entry $this->send(200, array('issue' => $this->format($issue, 'openedDate:time,lastEditedDate:time'))); } + + /** + * Process actions of one issue. + * + * @param string $type + * @param array $actions + * @access public + * @return array + */ + public function processActions($type, $actions) + { + $accountsList = array(); + foreach($actions as $action) + { + $accountsList[] = $action->actor; + ob_start(); + $this->action->printAction($action); + $action->title = ob_get_contents(); + ob_clean(); + + $action->body_html = ''; + + if(!empty($action->history)) + { + ob_start(); + $this->action->printChanges($action->objectType, $action->history); + $action->body_html = ob_get_contents(); + ob_clean(); + } + + if(!empty($action->comment)) + { + $comment = strip_tags($action->comment) == $action->comment ? nl2br($action->comment) : $action->comment; + $action->body_html = "
{$comment}
"; + } + } + + /* Format user detail and date. */ + $accountsList = array_unique($accountsList); + $userDetails = $this->loadModel('user')->getUserDetailsForAPI($accountsList); + foreach($actions as $action) + { + $action->actor = $userDetails[$action->actor]; + $action->date = gmdate("Y-m-d\TH:i:s\Z", strtotime($action->date)); + } + + return $actions; + } } diff --git a/api/v1/entries/productissues.php b/api/v1/entries/productissues.php index d26b72a76a..6cda85a31d 100644 --- a/api/v1/entries/productissues.php +++ b/api/v1/entries/productissues.php @@ -107,32 +107,35 @@ class productIssuesEntry extends entry $bugFilter = array_unique($bugFilter); $executions = $this->dao->select('project')->from(TABLE_PROJECTPRODUCT)->where('product')->eq($productID)->fetchPairs(); - if(!empty($taskFilter)) + + /* Get tasks. */ + if(empty($labelTypes) or in_array('task', $labelTypes)) { $query = $this->dao->select($taskFields)->from(TABLE_TASK)->where('execution')->in(array_values($executions)) ->beginIF($search)->andWhere('name')->like("%$search%")->fi() ->beginIF($status)->andWhere('status')->in($taskStatus[$status])->fi() ->andWhere('deleted')->eq(0); - foreach($taskFilter as $filter) if($filter != 'all') $query->andWhere('type')->eq($filter); $tasks = $query->fetchAll(); foreach($tasks as $task) $issues[] = array('id' => $task->id, 'type' => 'task', 'order' => $task->$order, 'status' => $this->getKey($task->status, $taskStatus)); } - if(!empty($storyFilter)) + /* Get stories. */ + if(empty($labelTypes) or in_array('story', $labelTypes)) { $query = $this->dao->select($storyFields)->from(TABLE_STORY) ->where('product')->eq($productID) ->beginIF($search)->andWhere('title')->like("%$search%")->fi() ->beginIF($status)->andWhere('status')->in($storyStatus[$status])->fi() ->andWhere('deleted')->eq(0); - foreach($storyFilter as $filter) if($filter != 'all') $query->andWhere('category')->eq($filter); $stories = $query->fetchAll(); foreach($stories as $story) $issues[] = array('id' => $story->id, 'type' => 'story', 'order' => $story->$order, 'status' => $this->getKey($story->status, $storyStatus)); } - if(!empty($bugFilter)) + /* Get bugs. */ + /* Get stories. */ + if(empty($labelTypes) or in_array('bug', $labelTypes)) { $query = $this->dao->select($bugFields)->from(TABLE_BUG) ->where('product')->eq($productID) @@ -305,7 +308,7 @@ class productIssuesEntry extends entry { foreach($issue->assignedTo as $index => $user) { - $issue->assignedTo[$index] = $userDetails[$user]; + $issue->assignedTo[$index] = $userDetails[$user]; } $issue->openedBy = $userDetails[$issue->openedBy]; } diff --git a/config/zentaopms.php b/config/zentaopms.php index fe193d98ca..bc2ecfea74 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -139,6 +139,7 @@ $config->openMethods[] = 'index.changelog'; $config->openMethods[] = 'my.preference'; $config->openMethods[] = 'my.changepassword'; $config->openMethods[] = 'my.profile'; +$config->openMethods[] = 'my.settutorialconfig'; /* Define the tables. */ define('TABLE_COMPANY', '`' . $config->db->prefix . 'company`'); diff --git a/framework/api/entry.class.php b/framework/api/entry.class.php index 225d71cf78..eb498ec90f 100644 --- a/framework/api/entry.class.php +++ b/framework/api/entry.class.php @@ -188,7 +188,7 @@ class baseEntry header("Content-type: application/json"); header("HTTP/1.1 {$this->statusCode[$code]}"); - if($data) echo json_encode($data); + if($data) echo json_encode($data, JSON_HEX_TAG); exit; } diff --git a/lib/base/front/front.class.php b/lib/base/front/front.class.php index c1e9d597f3..a81a355823 100644 --- a/lib/base/front/front.class.php +++ b/lib/base/front/front.class.php @@ -490,11 +490,7 @@ class baseHTML if(helper::inOnlyBodyMode()) return false; global $lang, $app, $config; - if(empty($label)) - { - global $lang, $config; - $label = $lang->goback; - } + if(empty($label)) $label = $lang->goback; $tab = $_COOKIE['tab']; $referer = strtolower($_SERVER['HTTP_REFERER']); diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 2eae7ec696..373db1cbbc 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -327,7 +327,7 @@ js::set('moduleID', $moduleID); session->bugList ? $this->session->bugList : $this->inlink('browse', "productID=$productID");?> - goback, $browseLink, 'self', '', 'btn btn-wide');?> + goback, '', 'class="btn btn-wide"');?> id);?> diff --git a/module/common/lang/en.php b/module/common/lang/en.php index d1238f0a8b..df6fe59f6e 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -296,7 +296,7 @@ $lang->createObjects['story'] = 'Story'; $lang->createObjects['task'] = 'Task'; $lang->createObjects['testcase'] = 'Case'; $lang->createObjects['execution'] = $lang->execution->common; -$lang->createObjects['project'] = $lang->projectCommon; +$lang->createObjects['project'] = 'Project'; $lang->createObjects['product'] = 'Product'; $lang->createObjects['program'] = 'Program'; $lang->createObjects['doc'] = 'Doc'; diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 979a276a96..414d918862 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -94,7 +94,7 @@ $lang->my->menu->work['subMenu']->task = array('link' => "{$lang->task->comm if($config->URAndSR) $lang->my->menu->work['subMenu']->requirement = "$lang->URCommon|my|work|mode=requirement"; $lang->my->menu->work['subMenu']->story = "$lang->SRCommon|my|work|mode=story"; $lang->my->menu->work['subMenu']->bug = "{$lang->bug->common}|my|work|mode=bug"; -$lang->my->menu->work['subMenu']->testcase = "{$lang->testcase->common}|my|work|mode=testcase&type=assigntome"; +$lang->my->menu->work['subMenu']->testcase = array('link' => "{$lang->testcase->common}|my|work|mode=testcase&type=assigntome", 'subModule' => 'testtask'); $lang->my->menu->work['subMenu']->testtask = "{$lang->testtask->common}|my|work|mode=testtask&type=wait"; $lang->my->menu->work['menuOrder'][5] = 'task'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index a97923eee7..634f5a18d5 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -296,7 +296,7 @@ $lang->createObjects['story'] = '需求'; $lang->createObjects['task'] = '任务'; $lang->createObjects['testcase'] = '用例'; $lang->createObjects['execution'] = $lang->execution->common; -$lang->createObjects['project'] = $lang->projectCommon; +$lang->createObjects['project'] = '项目'; $lang->createObjects['product'] = '产品'; $lang->createObjects['program'] = '项目集'; $lang->createObjects['doc'] = '文档'; diff --git a/module/common/model.php b/module/common/model.php index e32d9b92a7..1c1d81a7eb 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -367,7 +367,8 @@ class commonModel extends model foreach($lang->createIcons as $objectType => $objectIcon) { if(!isset($config->proVersion) and $objectType == 'effort') continue; - if($config->systemMode == 'classic' and ($objectType == 'project' or $objectType == 'porgram')) continue; + if($config->systemMode == 'classic' and strpos('project|program', $objectType) !== false) continue; + if(!empty($_COOKIE['feedbackView']) and strpos('todo|effort', $objectType) === false) continue; /* Change icon when object type is execution and mode is classic. */ if($config->systemMode == 'classic' and $objectType == 'execution') $objectIcon = 'project'; @@ -392,12 +393,13 @@ class commonModel extends model $showCreateList = true; $isOnlyBody = strpos('effort|doc', $objectType) !== false; $iconWord = $objectType == 'doc' ? 'W' : ''; // No ducument icon, print word instead of icon. + $attr = $objectType == 'effort' ? "data-width='95%' class='iframe' data-toggle='modal'" : "class='iframe'"; $params = ''; - if($objectType == 'bug' or $objectType == 'testcase') $params = "productID=$productID"; + if(strpos('bug|testcase|story', $objectType) !== false) $params = "productID=$productID"; if($objectType == 'doc') $params = "objectType=&objectID=0&libID=0"; - $html .= '
  • ' . html::a(helper::createLink($objectType, $createMethod, $params, '', $isOnlyBody), "$iconWord " . $lang->createObjects[$objectType], '', $isOnlyBody ? "class='iframe'" : '') . '
    • '; + $html .= '
  • ' . html::a(helper::createLink($objectType, $createMethod, $params, '', $isOnlyBody), "$iconWord " . $lang->createObjects[$objectType], '', $isOnlyBody ? $attr : '') . '
    • '; } } @@ -1350,7 +1352,7 @@ EOD; $executionPairs = array(); $object = $app->dbh->query('SELECT project,type FROM ' . TABLE_EXECUTION . " WHERE `id` = '$executionID'")->fetch(); $orderBy = $object->type == 'stage' ? 'ORDER BY `id` ASC' : 'ORDER BY `id` DESC'; - $executionList = $app->dbh->query("SELECT id,name FROM " . TABLE_EXECUTION . " WHERE `project` = '{$object->project}' $orderBy")->fetchAll(); + $executionList = $app->dbh->query("SELECT id,name FROM " . TABLE_EXECUTION . " WHERE `project` = '{$object->project}' AND `deleted` = '0' $orderBy")->fetchAll(); foreach($executionList as $execution) { if($execution->id == $executionID) continue; diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php index 56521cfb98..8d38bca3ff 100755 --- a/module/common/view/header.html.php +++ b/module/common/view/header.html.php @@ -19,7 +19,7 @@ include 'chosen.html.php';
    diff --git a/module/custom/js/mode.js b/module/custom/js/mode.js index b24c0ac56f..e69de29bb2 100644 --- a/module/custom/js/mode.js +++ b/module/custom/js/mode.js @@ -1,9 +0,0 @@ -$(function() -{ - $('[name=mode]').change(function() - { - var mode = $(this).val(); - if(mode == 'new') $('#modeTips').html(newTips); - if(mode == 'classic') $('#modeTips').html(classicTips); - }) -}) diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php index bb1077a87d..1f7fbebd90 100644 --- a/module/custom/view/mode.html.php +++ b/module/custom/view/mode.html.php @@ -11,8 +11,6 @@ */ ?> -upgrade->selectedModeTips['new'])?> -custom->changeClassicTip)?>
    @@ -29,7 +27,7 @@

    -

    custom->changeClassicTip : $lang->upgrade->selectedModeTips['new'];?>

    +

    upgrade->selectedModeTips['new'];?>

    diff --git a/module/doc/config.php b/module/doc/config.php index c00a0fcf33..a8c78892f1 100644 --- a/module/doc/config.php +++ b/module/doc/config.php @@ -9,7 +9,7 @@ $config->doc->edit = new stdclass(); $config->doc->createlib->requiredFields = 'name'; $config->doc->editlib->requiredFields = 'name'; -$config->doc->create->requiredFields = 'title'; +$config->doc->create->requiredFields = 'lib,title'; $config->doc->edit->requiredFields = 'title'; $config->doc->customObjectLibs = 'files,customFiles'; diff --git a/module/doc/control.php b/module/doc/control.php index 267e3b35f0..db0d4cbfe4 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -320,14 +320,18 @@ class doc extends control if($this->config->systemMode == 'classic') unset($this->lang->doc->menu->execution['subMenu']); } - $lib = $this->doc->getLibByID($libID); - $type = !empty($lib) ? $lib->type : 'product'; + /* Get libs and the default lib id. */ $unclosed = strpos($this->config->doc->custom->showLibs, 'unclosed') !== false ? 'unclosedProject' : ''; + $libs = $this->doc->getLibs($objectType, $extra = "withObject,$unclosed", $libID, $objectID); + if(!$libID and !empty($libs)) $libID = key($libs); + + $lib = $this->doc->getLibByID($libID); + $type = !empty($lib) ? $lib->type : 'product'; if(!isonlybody()) $this->view->title = $lib->name . $this->lang->colon . $this->lang->doc->create; $this->view->libID = $libID; - $this->view->libs = $this->doc->getLibs($objectType, $extra = "withObject,$unclosed", $libID, $objectID); + $this->view->libs = $libs; $this->view->libName = $this->dao->findByID($libID)->from(TABLE_DOCLIB)->fetch('name'); $this->view->moduleOptionMenu = $this->tree->getOptionMenu($libID, 'doc', $startModuleID = 0); $this->view->moduleID = $moduleID ? (int)$moduleID : (int)$this->cookie->lastDocModule; diff --git a/module/doc/js/edit.js b/module/doc/js/edit.js index 433e028559..bae3663c3e 100644 --- a/module/doc/js/edit.js +++ b/module/doc/js/edit.js @@ -7,6 +7,7 @@ $(function() $('#content').html(draft); editor = KindEditor.instances[0]; editor.html(draft); + $('.kindeditor-ph').remove(); } }, 100) diff --git a/module/doc/model.php b/module/doc/model.php index 0d998ab794..34b2071b52 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -61,7 +61,7 @@ class docModel extends model { if($lib->product != 0 and !isset($products[$lib->product])) continue; if($lib->execution != 0 and !isset($executions[$lib->execution])) continue; - if($lib->project != 0 and !isset($project[$lib->project])) continue; + if($lib->project != 0 and !isset($projects[$lib->project]) and $lib->type == 'project') continue; if($this->checkPrivLib($lib, $extra)) { @@ -499,6 +499,12 @@ class docModel extends model ->remove('files,labels,uid,contactListMenu') ->get(); + if(empty($doc->lib)) + { + dao::$errors['lib'] = sprintf($this->lang->error->notempty, $this->lang->doc->lib); + return false; + } + /* Fix bug #2929. strip_tags($this->post->contentMarkdown, $this->config->allowedTags)*/ $doc = $this->loadModel('file')->processImgURL($doc, $this->config->doc->editor->create['id'], $this->post->uid); $doc->contentMarkdown = $this->post->contentMarkdown; @@ -2304,7 +2310,7 @@ EOT; { $libs = $this->getLibsByObject('book', 0, '', $appendLib); $this->app->rawMethod = 'book'; - if($libID == 0 and !empty($libs)) $libID = reset($libs)->id; + if(!empty($libs) and ($libID == 0 or !isset($libs[$libID]))) $libID = reset($libs)->id; $this->lang->modulePageNav = $this->select($type, $objects, $objectID, $libs, $libID); $object = new stdclass(); diff --git a/module/doc/view/tablecontents.html.php b/module/doc/view/tablecontents.html.php index e54b1de5a8..fa0adfb0db 100644 --- a/module/doc/view/tablecontents.html.php +++ b/module/doc/view/tablecontents.html.php @@ -52,7 +52,7 @@ if(empty($type)) $type = 'product'; echo '
    '; } - if($type == 'book' and ($canEditLib or $canManageBook)) + if($type == 'book' and ($canEditLib or $canManageBook) and !empty($libs)) { echo "
    "; echo html::a('javascript:;', "", '', "data-toggle='dropdown' class='btn btn-link'"); diff --git a/module/execution/control.php b/module/execution/control.php index 88ec2bcdb4..44e9d9622c 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2560,6 +2560,7 @@ class execution extends control $this->session->set('bugList', $uri, 'qa'); $this->session->set('caseList', $uri, 'qa'); $this->session->set('testtaskList', $uri, 'qa'); + $this->session->set('reportList', $uri, 'qa'); /* use first execution if executionID does not exist. */ if(!isset($this->executions[$executionID])) $executionID = key($this->executions); diff --git a/module/execution/css/create.css b/module/execution/css/create.css index 7cd4be44f3..d482356317 100644 --- a/module/execution/css/create.css +++ b/module/execution/css/create.css @@ -14,3 +14,4 @@ .checkbox input[type=checkbox], .checkbox-inline input[type=checkbox], .radio input[type=radio], .radio-inline input[type=radio] {margin-top: 1px;} #lifeTimeTips {display: none;} +#teams_chosen ul .label {margin-top: 3px;} diff --git a/module/execution/js/create.js b/module/execution/js/create.js index a859b26f23..fd90c0791f 100644 --- a/module/execution/js/create.js +++ b/module/execution/js/create.js @@ -46,7 +46,11 @@ $(function() $('#teams_chosen').click(function() { - if(systemMode == 'new') $('#teams_chosen ul li:first').after(' '); + if(systemMode == 'new') + { + $('#teams_chosen ul .label').remove(); + $('#teams_chosen ul li:first').after(' '); + } }) $('#teams').change(function() diff --git a/module/execution/model.php b/module/execution/model.php index 10416cdcf5..35a0472e04 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -507,7 +507,7 @@ class executionModel extends model ->batchcheck($this->config->execution->edit->requiredFields, 'notempty') ->checkIF($execution->begin != '', 'begin', 'date') ->checkIF($execution->end != '', 'end', 'date') - ->checkIF($execution->end != '', 'end', 'gt', $execution->begin) + ->checkIF($execution->end != '', 'end', 'ge', $execution->begin) ->check('code', 'unique', "id != $executionID and code != '' and deleted = '0'") ->where('id')->eq($executionID) ->limit(1) @@ -1005,7 +1005,6 @@ class executionModel extends model ->beginIF($projectID and $this->config->systemMode == 'new')->andWhere('project')->eq($projectID)->fi() ->beginIF($type != 'all' and $this->config->systemMode == 'new')->andWhere('type')->eq($type)->fi() ->beginIF(strpos($mode, 'withdelete') === false)->andWhere('deleted')->eq(0)->fi() - ->beginIF(!$this->app->user->admin and $this->config->systemMode == 'new')->andWhere('project')->in($this->app->user->view->projects)->fi() ->beginIF(!$this->app->user->admin and strpos($mode, 'all') === false)->andWhere('id')->in($this->app->user->view->sprints)->fi() ->orderBy($orderBy) ->fetchAll(); @@ -1069,7 +1068,6 @@ class executionModel extends model ->beginIF($status == 'undone')->andWhere('t2.status')->notIN('done,closed')->fi() ->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi() ->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi() - ->beginIF(!$this->app->user->admin)->andWhere('t2.project')->in($this->app->user->view->projects)->fi() ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi() ->orderBy('order_desc') ->beginIF($limit)->limit($limit)->fi() @@ -1084,7 +1082,6 @@ class executionModel extends model ->beginIF($projectID)->andWhere('project')->eq($projectID)->fi() ->beginIF($status == 'undone')->andWhere('status')->notIN('done,closed')->fi() ->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi() - ->beginIF(!$this->app->user->admin)->andWhere('project')->in($this->app->user->view->projects)->fi() ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi() ->orderBy('order_desc') ->beginIF($limit)->limit($limit)->fi() @@ -1113,7 +1110,6 @@ class executionModel extends model ->where('t1.product')->eq($productID) ->andWhere('t2.deleted')->eq(0) ->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi() - ->beginIF(!$this->app->user->admin)->andWhere('t2.project')->in($this->app->user->view->projects)->fi() ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi() ->andWhere('t2.openedBy', true)->eq($this->app->user->account) ->orWhere('t3.account')->eq($this->app->user->account) @@ -1129,7 +1125,6 @@ class executionModel extends model return $this->dao->select('t1.*, IF(INSTR(" done,closed", t1.status) < 2, 0, 1) AS isDone')->from(TABLE_EXECUTION)->alias('t1') ->leftJoin(TABLE_TEAM)->alias('t2')->on('t2.root=t1.id') ->where('t1.deleted')->eq(0) - ->beginIF(!$this->app->user->admin)->andWhere('t1.project')->in($this->app->user->view->projects)->fi() ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->sprints)->fi() ->andWhere('t1.openedBy', true)->eq($this->app->user->account) ->orWhere('t2.account')->eq($this->app->user->account) @@ -1430,7 +1425,6 @@ class executionModel extends model $list = $this->dao->select('t1.id,t1.name,t1.status,t2.product')->from(TABLE_EXECUTION)->alias('t1') ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.project') ->where('t1.deleted')->eq(0) - ->beginIF(!$this->app->user->admin)->andWhere('t1.project')->in($this->app->user->view->projects)->fi() ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->sprints)->fi() ->fetchGroup('product'); @@ -2461,6 +2455,7 @@ class executionModel extends model ->andWhere('(project')->eq($projectID) ->orWhere('id')->eq($projectID) ->markRight(1) + ->orderBy('project_asc') ->fetchAll('id'); if(empty($teams)) return array(); @@ -3396,7 +3391,7 @@ class executionModel extends model $days = count($dateList) - 1; $rate = $days ? $firstTime / $days : ''; $baselineJSON = '['; - foreach($dateList as $i => $date) $baselineJSON .= round(($days - $i) * $rate, 1) . ','; + foreach($dateList as $i => $date) $baselineJSON .= round(($days - $i) * (int)$rate, 1) . ','; $baselineJSON = rtrim($baselineJSON, ',') . ']'; $chartData['labels'] = $this->report->convertFormat($dateList, DT_DATE5); diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php index 00b71a9267..54510c4bd4 100644 --- a/module/execution/view/create.html.php +++ b/module/execution/view/create.html.php @@ -38,7 +38,7 @@ systemMode);?> -projectCommon);?> +project->common);?>
    diff --git a/module/gitlab/model.php b/module/gitlab/model.php index 1d3b31d592..5bd5a65153 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -406,9 +406,9 @@ class gitlabModel extends model $allResults = array(); for($page = 1; true; $page ++) { - $results = json_decode(commonModel::http($host . "?private_token={$gitlab->token}&simple=true&membership=true&page={$page}&per_page=100")); + $results = json_decode(commonModel::http($host . "?private_token={$gitlab->token}&simple=true&page={$page}&per_page=100")); if(empty($results) or $page > 10) break; - $allResults = $allResults + $results; + $allResults = array_merge($allResults, $results); } return $allResults; diff --git a/module/my/control.php b/module/my/control.php index da5da01193..23d214c21b 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -443,7 +443,9 @@ class my extends control $this->loadModel('testtask'); /* Save session. */ - $this->session->set('caseList', $this->app->getURI(true), 'qa'); + $uri = $this->app->getURI(true); + $this->session->set('caseList', $uri, 'qa'); + $this->session->set('bugList', $uri . "#app={$this->app->tab}", 'qa'); /* Load pager. */ $this->app->loadClass('pager', $static = true); diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index 46a93088ca..1fc94723f8 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -82,7 +82,7 @@ pri?>' title='testcase->priList, $case->pri, $case->pri);?>'>testcase->priList, $case->pri, $case->pri)?> version";?> task";?> - createLink('testcase', 'view', $params), $case->title, null, "style='color: $case->color'");?> + createLink('testcase', 'view', $params), $case->title, null, "style='color: $case->color' title='{$case->title}'");?> taskName;?> diff --git a/module/product/css/kanban.css b/module/product/css/kanban.css index 47b4bd9ad2..8100681b52 100644 --- a/module/product/css/kanban.css +++ b/module/product/css/kanban.css @@ -1,12 +1,15 @@ #kanban {padding: 10px;} -.main-table tbody>tr>td {padding: 10px;} -.table caption {background: #fff; border-top-left-radius: 2px; border-top-right-radius: 2px; margin-bottom: 0; font-weight: 500;} -.table .program {writing-mode: vertical-lr; padding-left: 4px !important; color: #fff;} - +.table caption {background: #fff; border-top-left-radius: 2px; border-top-right-radius: 2px; margin-bottom: 0; font-weight: 500; padding-top: 0;} .table th, .table td {border-top: 2px solid #fff; border-bottom: 2px solid #fff; border-left: 3px solid #fff; border-bottom: 3px solid #fff;} .table tbody tr:last-child td {border-bottom: unset;} -td.project, td.execution {padding: 10px 0 !important;} -td.plan, td.release {vertical-align: top !important;} +td.plan, td.release, td.project, td.execution {vertical-align: top !important;} + +.main-table tbody>tr>td {padding: 0 10px 10px;} +.table .program {writing-mode: vertical-lr; padding-left: 4px !important; color: #fff;} +td.product {padding-top: 10px !important;} +td.project, td.execution {padding: 0 0 10px 0 !important;} +td > div:not(.board) > .board-item:first-child {margin-top: 10px;} +td > div.board:first-child {margin-top: 5px;} .board-item {border: 1px solid #ebebeb; padding: 3px 10px; cursor: default; border-radius: 2px; background-color: #fff; text-align: left;} .board-item:hover {border-color: #ccc;} @@ -14,8 +17,10 @@ td.plan, td.release {vertical-align: top !important;} .board + .board {margin-top: 5px;} .board-item + .board-item {margin-top: 10px;} .project .board, .execution .board {padding-top: 5px; border-top: 2px solid #fff;} -.project .board:first-child, .execution .board:first-child {padding-top: 0; border-top: unset;} +.project .board:first-child, .execution .board:first-child {padding-top: 5px; border-top: unset;} .release .board-item {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;} .emptyBoard {padding: 3px 10px; cursor: default;} .project .table-row > .table-col:last-child, .execution .table-row > .table-col:last-child {width: 24px; padding-top: 2px;} + +.scroll {overflow-x: hidden;; overflow-y: auto;} diff --git a/module/product/model.php b/module/product/model.php index 8876cf7396..e9e891a509 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -346,15 +346,15 @@ class productModel extends model */ public function getProducts($projectID = 0, $status = 'all', $orderBy = '') { - return $this->dao->select('t1.branch, t1.plan, t2.*') - ->from(TABLE_PROJECTPRODUCT)->alias('t1') - ->leftJoin(TABLE_PRODUCT)->alias('t2') - ->on('t1.product = t2.id') - ->where('t2.deleted')->eq(0) - ->beginIF(!empty($projectID))->andWhere('t1.project')->eq($projectID)->fi() - ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->products)->fi() + return $this->dao->select('t1.*, t2.branch, t2.plan') + ->from(TABLE_PRODUCT)->alias('t1') + ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2') + ->on('t1.id = t2.product') + ->where('t1.deleted')->eq(0) + ->beginIF(!empty($projectID))->andWhere('t2.project')->eq($projectID)->fi() + ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->products)->fi() ->beginIF(strpos($status, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi() - ->orderBy($orderBy . 't2.order asc') + ->orderBy($orderBy . 't1.order asc') ->fetchAll('id'); } @@ -1101,7 +1101,7 @@ class productModel extends model foreach($executions as $id => $execution) $projectIdList[$execution->project] = $execution->project; $executionPairs = array(0 => ''); - $projectPairs = $this->loadModel('project')->getPairsByIdList($projectIdList); + $projectPairs = $this->loadModel('project')->getPairsByIdList($projectIdList, 'all'); foreach($executions as $id => $execution) { if($execution->grade == 2 && isset($executions[$execution->parent])) diff --git a/module/product/view/kanban.html.php b/module/product/view/kanban.html.php index fea369c397..0baf449beb 100644 --- a/module/product/view/kanban.html.php +++ b/module/product/view/kanban.html.php @@ -39,29 +39,38 @@ $programProduct):?> + 5 or $releaseCount > 5)) $scroll = 'scroll'; + ?> - + - createLink('product', 'browse', "productID=$productID"), $productList[$productID]->name, '', "title={$productList[$productID]->name}");?> + " . html::a($this->createLink('product', 'browse', "productID=$productID"), $productList[$productID]->name, '', "title={$productList[$productID]->name}") . '';?> name}>{$productList[$productID]->name}";?> - - $plan):?> -
    - - createLink('productplan', 'view', "planID=$planID"), $plan->title, '', "title={$plan->title}");?> - - title}>{$plan->title}"?> +
    + + $plan):?> +
    + + createLink('productplan', 'view', "planID=$planID"), $plan->title, '', "title={$plan->title}");?> + + title}>{$plan->title}"?> + +
    +
    - - @@ -133,18 +142,20 @@ - - $release):?> -
    - - createLink('release', 'view', "releaseID=$releaseID"), $release->name, '', "title={$release->name} class='text-ellipsis'");?> - - name}>{$release->name}"?> +
    + + $release):?> +
    + + createLink('release', 'view', "releaseID=$releaseID"), $release->name, '', "title={$release->name} class='text-ellipsis'");?> + + name}>{$release->name}"?> + + marker) echo " ";?> +
    + - marker) echo " ";?>
    - - @@ -168,7 +179,14 @@ $(function() } }) - $('.emptyBoard').parent().height($('.project .board').height()); + $('.board').height($('.project .board').height()); + + $('.table div.scroll').each(function() + { + var count = $(this).parent().siblings('td.project').children('.board').length >= 5 ? $(this).parent().siblings('td.project').children('.board').length : 5; + var preHeight = $(this).parent().siblings('td.project').children('.board').length >= 5 ? $('.board').outerHeight(true) : $(this).find('.board-item').outerHeight(true); + $(this).css('max-height', preHeight * count); + }) }) diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php index ba1bbe14db..b904de65bf 100644 --- a/module/product/view/project.html.php +++ b/module/product/view/project.html.php @@ -55,11 +55,11 @@ systemMode == 'new') { - echo html::a($this->createLink('project', 'index', 'project=' . $project->id), $project->name, '_parent'); + echo html::a($this->createLink('project', 'index', 'project=' . $project->id), $project->name); } else { - echo html::a($this->createLink('execution', 'task', 'project=' . $project->id), $project->name, '_parent'); + echo html::a($this->createLink('execution', 'task', 'project=' . $project->id), $project->name); } ?> diff --git a/module/program/control.php b/module/program/control.php index e7e252260d..266260265b 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -96,9 +96,6 @@ class program extends control $this->program->setMenu($programID); - $program = $this->program->getByID($programID); - if(empty($program) || $program->type != 'program') die(js::error($this->lang->notFound) . js::locate('back')); - /* Load pager and get tasks. */ $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); @@ -106,6 +103,7 @@ class program extends control /* Get the top programID. */ if($programID) { + $program = $this->program->getByID($programID); $path = explode(',', $program->path); $path = array_filter($path); $programID = current($path); @@ -113,7 +111,7 @@ class program extends control $this->view->title = $this->lang->program->product; $this->view->position[] = $this->lang->program->product; - $this->view->program = $program; + $this->view->programID = $programID; $this->view->browseType = $browseType; $this->view->orderBy = $orderBy; $this->view->pager = $pager; @@ -386,12 +384,12 @@ class program extends control { $programID = $this->program->saveState($programID, $this->program->getPairs()); setCookie("lastProgram", $programID, $this->config->cookieLife, $this->config->webRoot, '', false, true); - if(!$programID) $this->locate($this->createLink('program', 'browse')); $this->program->setMenu($programID); - $this->app->session->set('programProject', $this->app->getURI(true), 'program'); - $this->app->session->set('projectList', $this->app->getURI(true), 'project'); + $uri = $this->app->getURI(true); + $this->app->session->set('programProject', $uri, 'program'); + $this->app->session->set('projectList', $uri, 'program'); $this->loadModel('datatable'); @@ -410,7 +408,6 @@ class program extends control $this->view->projectStats = $projectStats; $this->view->pager = $pager; $this->view->programID = $programID; - $this->view->program = $this->program->getByID($programID); $this->view->users = $this->loadModel('user')->getPairs('noletter|pofirst|nodeleted'); $this->view->browseType = $browseType; $this->view->orderBy = $orderBy; diff --git a/module/program/css/kanban.css b/module/program/css/kanban.css index 79fcfb66d9..0532b5c7fb 100644 --- a/module/program/css/kanban.css +++ b/module/program/css/kanban.css @@ -1,11 +1,13 @@ .main-table .table {cursor: default;} .main-table .table td {background: #f5f5f5;} +.main-table tbody>tr>td:first-child {padding: 0px 8px} .lane-name {overflow: hidden; text-overflow: ellipsis; writing-mode: vertical-lr;} .board-item {border: 1px solid #EBEBEB; padding: 5px 10px; cursor: default; border-radius: 2px; background-color: #fff;} .board-item:hover {border-color: #ccc;} -.board-item + .board-item {margin-top: 10px;} +.board-item {margin-top: 10px;} +.board-item:last-child {margin-bottom: 10px;} #kanban {overflow-y: auto;} #kanban tbody > tr > td {line-height: 24px;} @@ -15,12 +17,11 @@ .doing-td, .wait-project, .normal-plan, .normal-release {vertical-align: top !important;} -.doing-td > .board-doing > .table-row+.table-row {margin-top: 10px;} +.doing-td .board:first-child{padding-top: 0; border-top: unset;} -.board-doing-project {padding-right: 6px} -.board-doing-execution{padding-left: 6px} -.board-doing-project .table-row .table-col:last-child, .c-progress {width: 30px;} -.board-doing-execution .table-row .table-col:last-child, .c-progress {width: 30px;} -.table-row .table-col:first-child {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} +.project-line {width: 100%; height: 2px; background: #fff} + +.doing-td .table-row .table-col:last-child, .c-progress {width: 30px;} +.doing-td .table-row .table-col:first-child {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} .table-grouped tbody > tr > td:first-child, .table-grouped thead > tr > th:first-child {padding-left: 3px;} diff --git a/module/program/model.php b/module/program/model.php index 92762ba305..aa2520e0c8 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -258,6 +258,8 @@ class programModel extends model $project->hours = zget($hours, $project->id, array()); $product->projects[$status][] = $project; } + + $product->rowspan = isset($product->projects['doing']) ? count($product->projects['doing']) > 0 ? count($product->projects['doing']) : 1 : 1; } } @@ -265,6 +267,11 @@ class programModel extends model foreach($programs as $programID => $program) { $program->products = zget($productGroup, $programID, array()); + $program->rowspan = count($program->products) > 0 ? count($program->products) : 1; + foreach($program->products as $product) + { + if(isset($product->projects['doing']) and count($product->projects['doing']) > 0) $program->rowspan += count($product->projects['doing']) - 1; + } if(in_array($programID, $involvedPrograms)) { diff --git a/module/program/view/kanban.html.php b/module/program/view/kanban.html.php index 42523ec38f..acc8775ae2 100644 --- a/module/program/view/kanban.html.php +++ b/module/program/view/kanban.html.php @@ -12,6 +12,7 @@
    $programGroup):?> +
    @@ -35,13 +36,13 @@ $program):?> - name;?>>name;?> + name;?>>name;?> products)):?> products as $productID => $product):?> ';?> - name;?>>name;?> - + name;?> rowspan='rowspan;?>'>name;?> + plans as $planID => $plan):?>
    @@ -52,7 +53,7 @@
    - + projects['wait'])):?> projects['wait'] as $projectID => $project):?>
    @@ -65,53 +66,52 @@ - -
    - projects['doing'])):?> - projects['doing'] as $projectID => $project):?> -
    -
    -
    > -
    -
    - createLink('project', 'index', "projectID=$project->id"), $project->name);?> -
    -
    -
    - hours->progress) ? $project->hours->progress : 0;?> -
    -
    -
    -
    + projects['doing'])):?> + + projects['doing'] as $projectID => $project):?> + ";?> + +
    +
    > +
    +
    + createLink('project', 'index', "projectID=$project->id"), $project->name);?> +
    +
    +
    + hours->progress) ? $project->hours->progress : 0;?> +
    +
    -
    - execution)):?> -
    > -
    -
    - createLink('execution', 'task', "executionID={$project->execution->id}"), $project->execution->name);?> -
    -
    -
    - execution->hours->progress) ? $project->execution->hours->progress : 0;?> -
    -
    -
    -
    -
    -
    -
    - -
    - -
    - + + execution)):?> +
    +
    > +
    +
    + createLink('execution', 'task', "executionID={$project->execution->id}"), $project->execution->name);?> +
    +
    +
    + execution->hours->progress) ? $project->execution->hours->progress : 0;?> +
    +
    +
    +
    +
    +
    +
    +
    + + + + rowspan;?>> releases as $releaseID => $release):?>
    @@ -123,6 +123,15 @@
    + + ";?> + + + + + + + ';?> diff --git a/module/program/view/product.html.php b/module/program/view/product.html.php index 008e690738..6618fc12d3 100644 --- a/module/program/view/product.html.php +++ b/module/program/view/product.html.php @@ -17,11 +17,11 @@ product->featureBar['all'] as $key => $label):?> {$pager->recTotal}";?> - id&browseType=$key&orderBy=$orderBy"), "{$label}", '', "class='btn btn-link $active'");?> + {$label}", '', "class='btn btn-link $active'");?>
    - id", ' ' . $lang->product->create, '', 'class="btn btn-primary"');?> + ' . $lang->product->create, '', 'class="btn btn-primary"');?>
    @@ -32,11 +32,11 @@
    - id");?>'> + '> - id&browseType=$browseType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> + recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
    @@ -104,7 +104,7 @@ plans;?> releases;?> - id&action=edit&extra=&programID=$program->id", $product, 'list', 'edit');?> + id&action=edit&extra=&programID=$programID", $product, 'list', 'edit');?> @@ -129,7 +129,7 @@ -id)?> +