diff --git a/module/company/control.php b/module/company/control.php index 9e22d7d373..7fa559eef2 100644 --- a/module/company/control.php +++ b/module/company/control.php @@ -222,7 +222,7 @@ class company extends control $this->view->projects = array($this->lang->company->project) + $projects;; /* Get executions' list.*/ - $executions = $this->loadModel('execution')->getPairs(0, 'all', 'nocode'); + $executions = $this->loadModel('execution')->getPairs(0, 'all', 'nocode|multiple'); $executionsIDList = array_keys($executions); $executionsList = $this->execution->getByIdList($executionsIDList); foreach($executionsList as $executionsID => $executionObj) diff --git a/module/company/css/dynamic.css b/module/company/css/dynamic.css index bde70fd5a0..e24d31ce27 100644 --- a/module/company/css/dynamic.css +++ b/module/company/css/dynamic.css @@ -20,7 +20,8 @@ .c-project, .c-product, .c-execution {width: 110px !important; overflow: unset;} .c-user, .c-order {width: 96px !important; overflow: unset;} -.c-date {width: 200px;} +#mainMenu .picker .picker-selections{white-space:nowrap;} +.picker-drop-menu{width:auto !important; max-width:350px !important;} .timeline>li:before {left: -26px;} .timeline>li+li:after {left: -23px;} diff --git a/module/company/js/dynamic.js b/module/company/js/dynamic.js index ac0c4d1fb1..1a73197ab6 100644 --- a/module/company/js/dynamic.js +++ b/module/company/js/dynamic.js @@ -2,7 +2,7 @@ $('#account, #product, #project, #execution, #orderBy').change(function() { var userID = $('#account').val(); var productID = $('#product').length ? $('#product').val() : 0; - var projectID = systemMode == 'new' ? $('#project').val() : 0; + var projectID = $('#project').val(); var executionID = $('#execution').val(); var orderBy = $('#orderBy').val(); diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php index 0b4a7e45ad..8b607fdf07 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -32,9 +32,7 @@ config->vision == 'rnd'):?>
- systemMode == 'new'):?>
-
company->order, $orderBy, 'class="form-control chosen" data-max_drop_width="215" data-disable_search="true"'); ?>
action->dynamic->search;?>