-
kanban->type, $browseType, 'class="form-control chosen" data-max_drop_width="215"');?>
+
kanban->group->$browseType, $groupBy, 'class="form-control chosen" data-max_drop_width="215"');?>
+
diff --git a/module/execution/css/kanban.css b/module/execution/css/kanban.css index a04ce818c5..cef2290d04 100644 --- a/module/execution/css/kanban.css +++ b/module/execution/css/kanban.css @@ -31,4 +31,5 @@ .dropdown-menu a {text-align: left;} .scrollbar-hover {max-height: 2000px; overflow: scroll !important;} -.c-type, .c-group {width: 150px !important; overflow: unset; display: "";} +.c-type, .c-group {width: 150px !important; overflow: unset;} +.c-type {margin-left: 0px !important;} diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index 1320523f63..52180a5e36 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -660,9 +660,6 @@ $(function() onRenderCount: renderColumnCount }; - /* Hide group menu. */ - hideGroupMenu(); - if(groupBy == 'default') { /* Create story kanban 创建需求看板 */ @@ -719,26 +716,10 @@ $(function() }) }); -/** - * Hide group menu. - * - * @access public - * @return void - */ -function hideGroupMenu() -{ - var type = $('#type').val(); - if(type == 'all') $('.c-group').hide(); -} - $('#type').change(function() { var type = $('#type').val(); - if(type == 'all') - { - $('.c-group').hide(); - } - else + if(type != 'all') { $('.c-group').show(); $.get(createLink('execution', 'ajaxGetGroup', 'type=' + type), function(data) diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php index c3158959c8..7c82a688b9 100644 --- a/module/execution/view/kanban.html.php +++ b/module/execution/view/kanban.html.php @@ -13,12 +13,13 @@