diff --git a/module/dept/control.php b/module/dept/control.php index bef0eeab2f..f2334e1651 100644 --- a/module/dept/control.php +++ b/module/dept/control.php @@ -131,4 +131,18 @@ class dept extends control die(js::reload('parent')); } } + + /** + * Ajax get users + * + * @param int $dept + * @param string $user + * @access public + * @return void + */ + public function ajaxGetUsers($dept, $user = '') + { + $users = array('' => '') + $this->dept->getDeptUserPairs($dept); + die(html::select('user', $users, $user, "class='form-control chosen'")); + } } diff --git a/module/product/control.php b/module/product/control.php index 843e2ad6a1..20ef13cf85 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -505,7 +505,14 @@ class product extends control */ public function ajaxGetProjects($productID, $projectID = 0, $branch = 0) { - $projects = $this->product->getProjectPairs($productID, $branch ? "0,$branch" : $branch, $params = 'nodeleted'); + if($productID == 0) + { + $projects = array(0 => '') + $this->loadModel('project')->getPairs(); + } + else + { + $projects = $this->product->getProjectPairs($productID, $branch ? "0,$branch" : $branch, $params = 'nodeleted'); + } die(html::select('project', $projects, $projectID, 'class=form-control onchange=loadProjectRelated(this.value)')); }