diff --git a/module/bug/control.php b/module/bug/control.php
index 53bd69e118..81c5d74116 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -2254,12 +2254,13 @@ class bug extends control
* AJAX: get all users as assignedTo list.
*
* @param string $selectedUser
+ * @param string $params noletter|noempty|nodeleted|noclosed|withguest|pofirst|devfirst|qafirst|pmfirst|realname|outside|inside|all, can be sets of theme
* @access public
* @return string
*/
- public function ajaxLoadAllUsers($selectedUser = '')
+ public function ajaxLoadAllUsers($selectedUser = '', $params = 'devfirst|noclosed')
{
- $allUsers = $this->loadModel('user')->getPairs('devfirst|noclosed');
+ $allUsers = $this->loadModel('user')->getPairs($params);
return print(html::select('assignedTo', $allUsers, $selectedUser, 'class="form-control"'));
}
diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index d754ff9b23..3ddab97a57 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -60,14 +60,21 @@ function loadAll(productID)
*/
function loadAllUsers()
{
- var link = createLink('bug', 'ajaxLoadAllUsers', 'selectedUser=' + $('#assignedTo').val());
+ isClosedBug = typeof isClosedBug == 'undefined' ? false : isClosedBug;
+
+ var params = isClosedBug ? '¶ms=devfirst' : '';
+ var link = createLink('bug', 'ajaxLoadAllUsers', 'selectedUser=' + $('#assignedTo').val() + params);
$.get(link, function(data)
{
if(data)
{
- var moduleID = $('#module').val();
- var productID = $('#product').val();
- setAssignedTo(moduleID, productID);
+ if(!isClosedBug)
+ {
+ var moduleID = $('#module').val();
+ var productID = $('#product').val();
+ setAssignedTo(moduleID, productID);
+ }
+
$('#assignedTo').replaceWith(data);
$('#assignedTo_chosen').remove();
$('#assignedTo').chosen();
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 34330d2e23..94596414f9 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -28,6 +28,7 @@ js::set('systemMode' , $config->systemMode);
js::set('confirmUnlinkBuild' , sprintf($lang->bug->confirmUnlinkBuild, zget($resolvedBuilds, $bug->resolvedBuild)));
js::set('tab' , $this->app->tab);
js::set('bugBranch' , $bug->branch);
+js::set('isClosedBug' , $bug->status == 'closed');
if($this->app->tab == 'execution') js::set('objectID', $bug->execution);
if($this->app->tab == 'project') js::set('objectID', $bug->project);
?>
diff --git a/module/design/view/edit.html.php b/module/design/view/edit.html.php
index 42d3108719..6ecc46323a 100644
--- a/module/design/view/edit.html.php
+++ b/module/design/view/edit.html.php
@@ -79,7 +79,7 @@
tasks as $task):?>
| id?> |
- createLink('task', 'view', "taskID=$task->id"), $task->name, '_blank');?> | ;
+ createLink('task', 'view', "taskID=$task->id"), $task->name, '_blank');?> |
assignedTo);?> |
processStatus('task', $task);?> |
consumed;?> |
diff --git a/module/kanban/control.php b/module/kanban/control.php
index f05f52ccfc..3b4ac85967 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1512,7 +1512,7 @@ class kanban extends control
$this->loadModel($objectType)->delete(constant($table), $objectID);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
- $kanbanID = $regionID ? $this->kanban->getKanbanIDByregion($regionID) : $this->session->execution;
+ $kanbanID = $regionID ? $this->kanban->getKanbanIDByRegion($regionID) : $this->session->execution;
$browseType = $this->config->vision == 'lite' ? 'task' : $this->session->execLaneType;
$groupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
$kanbanGroup = $this->kanban->getRDKanban($kanbanID, $browseType, 'id_desc', 0, $groupBy);
diff --git a/module/personnel/css/whitelist.css b/module/personnel/css/whitelist.css
index 4c4d68cd08..fe83c611e1 100644
--- a/module/personnel/css/whitelist.css
+++ b/module/personnel/css/whitelist.css
@@ -1,3 +1,4 @@
-.c-dept {overflow:hidden; text-overflow: ellipsis; white-space: nowrap;}
+.c-dept, .c-role {overflow:hidden; text-overflow: ellipsis; white-space: nowrap;}
.c-phone {width: 120px;}
.c-email {width: 200px;}
+.c-role {width: 105px;}
diff --git a/module/personnel/view/whitelist.html.php b/module/personnel/view/whitelist.html.php
index 65ec18427c..1ebc7c4bf9 100644
--- a/module/personnel/view/whitelist.html.php
+++ b/module/personnel/view/whitelist.html.php
@@ -51,7 +51,7 @@
realname;?> |
dept);?> |
- user->roleList, $user->role);?> |
+ user->roleList, $user->role);?> |
phone;?> |
qq;?> |
weixin;?> |
diff --git a/module/project/css/team.css b/module/project/css/team.css
new file mode 100644
index 0000000000..562ac5d95c
--- /dev/null
+++ b/module/project/css/team.css
@@ -0,0 +1,3 @@
+.c-limited {width: 100px;}
+[lang^=de] .c-limited {width: 175px !important;}
+.c-actions-1 {width: 80px;}
diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php
index 695bf8ee1c..a128f443b5 100644
--- a/module/project/view/team.html.php
+++ b/module/project/view/team.html.php
@@ -58,9 +58,9 @@
team->days;?> |
team->hours;?> |
team->totalHours;?> |
- team->limited;?> |
+ team->limited;?> |
- actions;?> |
+ actions;?> |
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index f28acb9dfa..c3920a3f16 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -86,9 +86,9 @@
-
+