diff --git a/module/execution/control.php b/module/execution/control.php index e03dd8c3d0..8447df3dc3 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -3257,9 +3257,9 @@ class execution extends control * @access public * @return void */ - public function ajaxGetGroup($type, $group='id') + public function ajaxGetGroup($type, $group = 'default') { - $this->loadModel('kanban'); + $this->app->loadLang('kanban'); $groups = array(); $groups = $this->lang->kanban->group->$type; die(html::select("group", $groups, $group, 'class="form-control chosen" data-max_drop_width="215"')); diff --git a/module/execution/css/kanban.css b/module/execution/css/kanban.css index 3d19590938..133c32a0a1 100644 --- a/module/execution/css/kanban.css +++ b/module/execution/css/kanban.css @@ -15,4 +15,4 @@ .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; display: "";} diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index 0c57c29938..2534188576 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -692,7 +692,7 @@ $(function() } }; - /* Restore select menu */ + /* Hide second menu. */ restoreSelect(); /* Create story kanban 创建需求看板 */ @@ -706,7 +706,10 @@ $(function() }); /** - * Restore select menu. + * Hide second menu. + * + * @access public + * @return void */ function restoreSelect() { @@ -714,13 +717,11 @@ function restoreSelect() if(type == 'all') $('.c-group').css("display", "none"); } -/** - * Choose type. - */ $('#type').change(function() { - var type = $('#type').val(); $('.c-group').css("display", ""); + + var type = $('#type').val(); if(type == 'all') { $('.c-group').css("display", "none"); @@ -734,13 +735,11 @@ $('#type').change(function() $('#group').chosen(); }) } + var link = createLink('execution', 'kanban', "executionID=" + executionID + '&type=' + type); location.herf = link; }); -/** - * Choose group of lane. - */ $('.c-group').change(function() { $('.c-group').css("display","");