diff --git a/db/update16.4.sql b/db/update16.4.sql index 82969492c5..32f3287cb8 100644 --- a/db/update16.4.sql +++ b/db/update16.4.sql @@ -23,6 +23,7 @@ ALTER TABLE `zt_story` ADD `activatedDate` datetime NOT NULL AFTER `closedReason ALTER TABLE `zt_task` MODIFY `activatedDate` datetime NOT NULL AFTER `lastEditedDate`; ALTER TABLE `zt_kanbancard` ADD `progress` float unsigned NOT NULL DEFAULT '0' AFTER `estimate`; +UPDATE `zt_kanbancard` SET `progress`='100' WHERE `status` = 'done' and `fromtype` = ''; ALTER TABLE `zt_user` ADD `visions` varchar(20) NOT NULL DEFAULT 'rnd,lite' AFTER `visits`; UPDATE `zt_user` SET `visions`='rnd,lite'; diff --git a/module/execution/control.php b/module/execution/control.php index f248464ce5..e869d8bf2a 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2895,11 +2895,7 @@ class execution extends control $this->execution->unlinkStory($executionID, $storyID); /* if kanban then reload and if ajax request then send result. */ - if(isonlybody()) - { - return print(js::reload('parent')); - } - elseif(helper::isAjaxRequest()) + if(helper::isAjaxRequest()) { if(dao::isError()) { @@ -2913,7 +2909,7 @@ class execution extends control } return $this->send($response); } - return print(js::locate($this->app->session->storyList, 'parent')); + return print(js::reload('parent')); } } diff --git a/module/kanban/css/createspace.css b/module/kanban/css/createspace.css index ac6894793f..f5ad743eb1 100644 --- a/module/kanban/css/createspace.css +++ b/module/kanban/css/createspace.css @@ -1 +1 @@ -#mainContent {padding-left: 0px;} +#mainContent {padding-left: 0px; height: 500px;} diff --git a/module/kanban/css/editspace.css b/module/kanban/css/editspace.css index ac6894793f..f5ad743eb1 100644 --- a/module/kanban/css/editspace.css +++ b/module/kanban/css/editspace.css @@ -1 +1 @@ -#mainContent {padding-left: 0px;} +#mainContent {padding-left: 0px; height: 500px;} diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css index ffb7494ac2..1ab18d6b40 100644 --- a/module/kanban/css/view.css +++ b/module/kanban/css/view.css @@ -82,6 +82,7 @@ .kanban-item .has-color .info > .user .lable-teamSumCount, .kanban-item .has-color .info > .label-light {color: #FFFFFF;} .kanban-item .has-color .info > .label-pri {border-color: #FFFFFF;} +.kanban-item .has-color .progress-box > .progress-number {color: #FFFFFF;} .kanban-item .item-more {position: absolute; right: 6px; top: 0px;} .kanban-card {height: auto !important; padding: 8px 14px !important; min-height: 60px;} diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index 346329d0d7..531b664c2c 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -1587,3 +1587,8 @@ function resetRegionHeight(fold) $('.region').css('height', regionHeaderHeight); } } + +$('.dropdown-menu').click(function() +{ + $.zui.ContextMenu.hide(); +}) diff --git a/module/kanban/model.php b/module/kanban/model.php index b6a9ce85dd..f88d8b4f7d 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -1647,14 +1647,14 @@ class kanbanModel extends model public function getSpacePairs($browseType = 'private') { $account = $this->app->user->account; - $spaceIdList = $this->getCanViewObjects('kanbanspace'); + $spaceIdList = $this->getCanViewObjects('kanbanspace', $browseType); return $this->dao->select('id,name')->from(TABLE_KANBANSPACE) ->where('deleted')->eq(0) + ->andWhere('id')->in($spaceIdList) ->beginIF(in_array($browseType, array('private', 'cooperation', 'public')))->andWhere('type')->eq($browseType)->fi() ->beginIF($browseType == 'involved')->andWhere('owner')->ne($account)->fi() ->beginIF($this->cookie->showClosed == 0 and $browseType != 'showClosed')->andWhere('status')->ne('closed')->fi() - ->beginIF(!$this->app->user->admin)->andWhere('id')->in($spaceIdList)->fi() ->orderBy('id_desc') ->fetchPairs('id'); } @@ -1694,7 +1694,7 @@ class kanbanModel extends model $spaceList = $objectType == 'kanban' ? $this->dao->select('id,owner,type')->from(TABLE_KANBANSPACE)->fetchAll('id') : array(); - if($this->app->user->admin and strpos('private,involved', $param) === false) return array_keys($objects); + if($param and $this->app->user->admin and strpos('private,involved', $param) === false) return array_keys($objects); $account = $this->app->user->account; foreach($objects as $objectID => $object) diff --git a/module/kanban/view/editcard.html.php b/module/kanban/view/editcard.html.php index 26f9bd2d4c..22c6b4eb4a 100644 --- a/module/kanban/view/editcard.html.php +++ b/module/kanban/view/editcard.html.php @@ -71,6 +71,7 @@ + progress):?> kanbancard->progress;?> @@ -80,6 +81,7 @@ + diff --git a/module/kanban/view/viewcard.html.php b/module/kanban/view/viewcard.html.php index 24399cc0e3..57c58922cb 100644 --- a/module/kanban/view/viewcard.html.php +++ b/module/kanban/view/viewcard.html.php @@ -114,10 +114,12 @@ kanbancard->estimate;?> estimate, 2) . ' ' . $lang->kanbancard->lblHour;?> + progress):?> kanbancard->progress;?> progress, 2) . ' %';?> + diff --git a/module/task/js/batchcreate.js b/module/task/js/batchcreate.js index 6ab66a60cf..89ff42b674 100755 --- a/module/task/js/batchcreate.js +++ b/module/task/js/batchcreate.js @@ -85,6 +85,18 @@ function copyStoryTitle(num) /* Set the story module. */ function setStoryRelated(num) +{ + setPreview(num); +} + +/** + * Set preview. + * + * @param int $num + * @access public + * @return void + */ +function setPreview(num) { var storyID = $('#story' + num).val(); if(storyID != 0 && storyID != 'ditto') @@ -224,6 +236,7 @@ $(document).on('chosen:showing_dropdown', 'select[name^="story"],.chosen-with-dr $(select).trigger("change"); } }) + $(document).on('mousedown', 'select', function() { if($(this).val() == 'ditto') @@ -253,7 +266,7 @@ $(function() if($.cookie('zeroTask') == 'true') toggleZeroTaskStory(); markStoryTask(); - if(storyID != 0) setStoryRelated(0); + if(storyID != 0) setStoryRelated($('#batchCreateForm table tbody tr:first [id^=story]:first').attr('id').replace('story', '')); $(document).keydown(function(event) { diff --git a/www/js/my.full.js b/www/js/my.full.js index c3b7069b6b..630874d86e 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -900,5 +900,12 @@ $(document).ready(function() $('#globalCreate').hover(function() { $(this).prev().removeClass('open'); + $(this).addClass('dropdown-hover'); + }); + + /* Hide create button when global create menu is clicked. */ + $('#globalCreate').click(function() + { + $(this).removeClass('dropdown-hover'); }); });