diff --git a/module/program/control.php b/module/program/control.php index cdd87a7dd6..c4afbdf693 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -415,6 +415,7 @@ class program extends control setCookie("lastPGM", $programID, $this->config->cookieLife, $this->config->webRoot, '', false, true); $this->app->session->set('PGMProject', $this->app->getURI(true)); + $this->app->session->set('projectList', $this->app->getURI(true)); $this->lang->navGroup->program = 'program'; $this->lang->program->switcherMenu = $this->program->getPGMSwitcher($programID, true); @@ -799,6 +800,7 @@ class program extends control if($this->session->moreProjectLink) $this->lang->program->mainMenuAction = html::a($this->session->moreProjectLink, ' ' . $this->lang->goback, '', "class='btn btn-link'"); $this->app->session->set('PRJBrowse', $this->app->getURI(true)); $this->loadModel('datatable'); + $this->session->set('projectList', $this->app->getURI(true)); /* Load pager and get tasks. */ $this->app->loadClass('pager', $static = true); @@ -1069,7 +1071,18 @@ class program extends control $this->lang->program->menu = $this->lang->PRJ->menu; } - $projectIdList = $this->post->projectIdList; + $projectIdList = $this->post->projectIdList ? $this->post->projectIdList : die(js::locate($this->session->projectList, 'parent')); + $projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->in($projectIdList)->fetchAll('id'); + + foreach($projects as $project) $appendPMUsers[$project->PM] = $project->PM; + + $this->view->title = $this->lang->program->batchEdit; + $this->view->position[] = $this->lang->program->batchEdit; + + $this->view->projectIdList = $projectIdList; + $this->view->projects = $projects; + $this->view->programList = $this->program->getParentPairs(); + $this->view->PMUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst', $appendPMUsers); $this->display(); } diff --git a/module/program/js/prjedit.js b/module/program/js/prjedit.js index 5a3173a6b7..eaec028443 100644 --- a/module/program/js/prjedit.js +++ b/module/program/js/prjedit.js @@ -20,7 +20,7 @@ $(function() if(data && !data.result) { - $('#promptTable td').remove(); + $('#promptTable tbody tr').remove(); for(var i in data.message) { var product = data.message[i]; diff --git a/module/program/view/prjbatchedit.html.php b/module/program/view/prjbatchedit.html.php index beb236de60..3b0f9cc475 100644 --- a/module/program/view/prjbatchedit.html.php +++ b/module/program/view/prjbatchedit.html.php @@ -11,4 +11,39 @@ */ ?> +program->PRJEdit->requiredFields;?> +
| program->multiLinkedProductsTip;?> | -
|---|
| program->multiLinkedProductsTip;?> | +