* Finish task#9003.
This commit is contained in:
@@ -66,6 +66,7 @@ class program extends control
|
||||
if(common::hasPriv('program', 'pgmcreate')) $this->lang->pageActions = html::a($this->createLink('program', 'pgmcreate'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->program->PGMCreate, '', "class='btn btn-secondary'");
|
||||
|
||||
$this->app->session->set('programList', $this->app->getURI(true));
|
||||
$this->app->session->set('PRJEdit', $this->app->getURI(true));
|
||||
$this->app->session->set('whitelist', $this->app->getURI(true));
|
||||
$this->app->session->set('PRJManageProducts', $this->app->getURI(true));
|
||||
|
||||
@@ -418,6 +419,7 @@ class program extends control
|
||||
if(!$programID) $this->locate($this->createLink('program', 'PGMbrowse'));
|
||||
setCookie("lastPGM", $programID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
|
||||
|
||||
$this->app->session->set('PRJEdit', $this->app->getURI(true));
|
||||
$this->app->session->set('whitelist', $this->app->getURI(true));
|
||||
$this->app->session->set('PRJManageProducts', $this->app->getURI(true));
|
||||
|
||||
@@ -799,6 +801,7 @@ class program extends control
|
||||
$this->lang->program->menu = $this->lang->PRJ->menu;
|
||||
$this->lang->program->mainMenuAction = html::a('javascript:history.go(-1);', '<i class="icon icon-back"></i> ' . $this->lang->goback, '', "class='btn btn-link'");
|
||||
$this->app->session->set('PRJBrowse', $this->app->getURI(true));
|
||||
$this->app->session->set('PRJEdit', $this->app->getURI(true));
|
||||
$this->app->session->set('whitelist', $this->app->getURI(true));
|
||||
$this->app->session->set('PRJManageProducts', $this->app->getURI(true));
|
||||
$this->loadModel('datatable');
|
||||
@@ -994,9 +997,7 @@ class program extends control
|
||||
$this->action->logHistory($actionID, $changes);
|
||||
}
|
||||
|
||||
$locateLink = inLink('PRJView', "projectID=$projectID");
|
||||
if($from == 'pgmbrowse') $locateLink = inLink('PGMBrowse');
|
||||
if($from == 'pgmproject') $locateLink = inLink('PGMProject', "programID=$programID");
|
||||
$locateLink = $this->session->PRJEdit ? $this->session->PRJEdit : inLink('PRJView', "projectID=$projectID");
|
||||
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
|
||||
}
|
||||
|
||||
@@ -1062,6 +1063,10 @@ class program extends control
|
||||
if($product->branch) $linkedBranches[$product->branch] = $product->branch;
|
||||
}
|
||||
|
||||
/* Load pager. */
|
||||
$this->app->loadClass('pager', $static = true);
|
||||
$pager = new pager(0, 30, 1);
|
||||
|
||||
$this->view->title = $this->lang->program->PRJView;
|
||||
$this->view->position = $this->lang->program->PRJView;
|
||||
$this->view->projectID = $projectID;
|
||||
@@ -1069,10 +1074,12 @@ class program extends control
|
||||
$this->view->products = $products;
|
||||
$this->view->actions = $this->loadModel('action')->getList('project', $projectID);
|
||||
$this->view->users = $this->loadModel('user')->getPairs('noletter');
|
||||
$this->view->teamMembers = $this->project->getTeamMembers($projectID);
|
||||
$this->view->statData = $this->program->getPRJStatData($projectID);
|
||||
$this->view->workhour = $this->program->getPRJWorkhour($projectID);
|
||||
$this->view->planGroup = $this->loadModel('project')->getPlans($products);;
|
||||
$this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products), '', $linkedBranches);
|
||||
$this->view->dynamics = $this->loadModel('action')->getDynamic('all', 'all', 'date_desc', $pager, 'all', $projectID);
|
||||
|
||||
$this->display();
|
||||
}
|
||||
@@ -1713,7 +1720,7 @@ class program extends control
|
||||
if($diffProducts) $this->loadModel('action')->create('project', $projectID, 'Managed', '', !empty($_POST['products']) ? join(',', $_POST['products']) : '');
|
||||
|
||||
$locateLink = $this->session->PRJManageProducts ? $this->session->PRJManageProducts : inLink('PRJManageProducts', "projectID=$projectID");
|
||||
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->session->PRJManageProducts));
|
||||
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
|
||||
}
|
||||
|
||||
$this->loadModel('product');
|
||||
|
||||
Reference in New Issue
Block a user