From 5c90c8677d4fcddf0b21ac009732dd540c2ff623 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 17 Mar 2022 10:23:16 +0800 Subject: [PATCH 1/3] * Fix bug #19061. --- module/story/model.php | 2 +- module/story/view/view.html.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/story/model.php b/module/story/model.php index 2274921c13..e23c63ecae 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -41,7 +41,7 @@ class storyModel extends model if($setImgSize) $story->spec = $this->file->setImgSize($story->spec); if($setImgSize) $story->verify = $this->file->setImgSize($story->verify); - $story->executions = $this->dao->select('t1.project, t2.name, t2.status')->from(TABLE_PROJECTSTORY)->alias('t1') + $story->executions = $this->dao->select('t1.project, t2.name, t2.status, t2.type')->from(TABLE_PROJECTSTORY)->alias('t1') ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project = t2.id') ->where('t1.story')->eq($storyID) ->andWhere('t2.type')->in('sprint,stage,kanban') diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 608e3c5b45..879f4df680 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -492,7 +492,8 @@ { foreach($story->executions as $executionID => $execution) { - echo "
  • " . html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name, '', "class='text-muted'") . '
    • '; + $html = ($execution->type == 'kanban' and isonlybody()) ? $execution->name : html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name, '', "class='text-muted'"); + echo "
  • " . $html . '
    • '; } } ?> From f3874a74ad6f81a8ab87010715eee77d1e4134c8 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 17 Mar 2022 10:59:48 +0800 Subject: [PATCH 2/3] * Fix bug #19074. --- module/kanban/js/common.js | 23 +++++++++++++++++++++++ module/kanban/js/createspace.js | 12 ------------ module/kanban/js/editspace.js | 12 ------------ module/kanban/view/createspace.html.php | 10 +++------- module/kanban/view/editspace.html.php | 12 ++++-------- 5 files changed, 30 insertions(+), 39 deletions(-) delete mode 100644 module/kanban/js/createspace.js delete mode 100644 module/kanban/js/editspace.js diff --git a/module/kanban/js/common.js b/module/kanban/js/common.js index a5710e8ed9..8b602a5482 100644 --- a/module/kanban/js/common.js +++ b/module/kanban/js/common.js @@ -85,3 +85,26 @@ function locateView(module, objectID) if(module == 'build') dataApp = 'project'; parent.$.apps.open(createLink(module, 'view', 'objectID=' + objectID), dataApp); } + +/** + * When type change. + * + * @param string type + * @access public + * @return void + */ +function changeType(type) +{ + if(type == 'private') + { + $('#ownerBox').addClass('hidden'); + $('#teamBox').addClass('hidden'); + $('#whitelistBox').removeClass('hidden'); + } + else + { + $('#ownerBox').removeClass('hidden'); + $('#teamBox').removeClass('hidden'); + $('#whitelistBox').addClass('hidden'); + } +} diff --git a/module/kanban/js/createspace.js b/module/kanban/js/createspace.js deleted file mode 100644 index ee146e7ee2..0000000000 --- a/module/kanban/js/createspace.js +++ /dev/null @@ -1,12 +0,0 @@ -/** - * When type change. - * - * @param string type - * @access public - * @return void - */ -function changeType(type) -{ - location.href = createLink('kanban', 'createSpace', 'type=' + type); -} - diff --git a/module/kanban/js/editspace.js b/module/kanban/js/editspace.js deleted file mode 100644 index 4ae84ccaf6..0000000000 --- a/module/kanban/js/editspace.js +++ /dev/null @@ -1,12 +0,0 @@ -/** - * When type change. - * - * @param int spaceID - * @param string type - * @access public - * @return void - */ -function changeType(spaceID, type) -{ - location.href = createLink('kanban', 'editSpace', 'spaceID=' + spaceID + '&type=' + type); -} diff --git a/module/kanban/view/createspace.html.php b/module/kanban/view/createspace.html.php index 464e2c6319..4d385cf203 100644 --- a/module/kanban/view/createspace.html.php +++ b/module/kanban/view/createspace.html.php @@ -27,12 +27,11 @@ kanbanspace->name;?> - - + kanbanspace->owner;?> - + kanbanspace->team;?>
    @@ -41,7 +40,6 @@
    - kanbanspace->desc;?> @@ -49,12 +47,10 @@ - - + whitelist;?> - diff --git a/module/kanban/view/editspace.html.php b/module/kanban/view/editspace.html.php index 59d7f58eec..df5eaeeca7 100644 --- a/module/kanban/view/editspace.html.php +++ b/module/kanban/view/editspace.html.php @@ -20,7 +20,7 @@ - + @@ -28,12 +28,11 @@ - type != 'private' or $type == 'cooperation' or $type == 'public'):?> - + - + - - type == 'private' and $type != 'cooperation' and $type != 'public'):?> - + -
    kanbanspace->type;?>
    name, "class='form-control'");?>
    kanbanspace->owner;?> owner, "class='form-control chosen'");?>
    kanbanspace->team;?>
    @@ -42,7 +41,6 @@
    kanbanspace->desc;?> @@ -50,12 +48,10 @@ desc, "rows='10' class='form-control'");?>
    whitelist;?> whitelist, 'class="form-control chosen" multiple');?>
    From e8d2aa6b3ebf34be46c0e4fd1cda184cf5ff9147 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 17 Mar 2022 11:13:04 +0800 Subject: [PATCH 3/3] * Modify variable name. --- module/story/view/view.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 879f4df680..cec2a78115 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -492,8 +492,8 @@ { foreach($story->executions as $executionID => $execution) { - $html = ($execution->type == 'kanban' and isonlybody()) ? $execution->name : html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name, '', "class='text-muted'"); - echo "
  • " . $html . '
    • '; + $execName = ($execution->type == 'kanban' and isonlybody()) ? $execution->name : html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name, '', "class='text-muted'"); + echo "
  • " . $execName . '
    • '; } } ?>