diff --git a/module/action/model.php b/module/action/model.php
index 97ee08747b..05b7774942 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1216,6 +1216,7 @@ class actionModel extends model
$this->app->loadLang('todo');
$this->app->loadLang('stakeholder');
$this->app->loadLang('branch');
+ $this->app->loadLang('execution');
/* Get commiters and the same department users. */
$commiters = $this->loadModel('user')->getCommiters();
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index 20ecce70db..533edde8db 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -132,7 +132,7 @@
unset($assignedToList['closed']);
}
?>
-
' style='overflow:visible'>status == 'closed' ? ucfirst($bug->assignedTo) : html::select("assignedTos[$bugID]", $assignedToList, $bug->assignedTo, "class='form-control picker-select' data-drop-width='135px'");?> |
+ ' style='overflow:visible'>status == 'closed' ? html::input("assignedTos[$bugID]", ucfirst($bug->assignedTo), 'class=form-control disabled') : html::select("assignedTos[$bugID]", $assignedToList, $bug->assignedTo, "class='form-control picker-select' data-drop-width='135px'");?> |
' style='overflow:visible'>deadline) ? '' : $bug->deadline, "class='form-control form-date'");?> |
>bug->osList, $bug->os, 'class="form-control chosen" multiple');?> |
>bug->browserList, $bug->browser, 'class="form-control chosen" multiple');?> |
diff --git a/module/execution/css/importtask.css b/module/execution/css/importtask.css
index 75e75d9b5f..c9a7fb1bf5 100644
--- a/module/execution/css/importtask.css
+++ b/module/execution/css/importtask.css
@@ -1,3 +1,4 @@
#fromproject_chosen .chosen-single {width: 220px;}
-.c-name {width: 200px;}
+.c-name {min-width: 200px;}
+.c-hour {width: 80px;}
#importTaskForm {min-height: 350px;}
diff --git a/module/execution/model.php b/module/execution/model.php
index 39756b26b9..6dba35e462 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1023,6 +1023,8 @@ class executionModel extends model
$this->loadModel('action')->create('execution', $parent->id, 'startbychildactivate');
}
}
+
+ return $changes;
}
/**
@@ -1096,6 +1098,7 @@ class executionModel extends model
}
$this->loadModel('score')->create('execution', 'close', $oldExecution);
+ return $changes;
}
}