id] ? ' class="closed"' : '') . '>' . $li . '';
}
-
- /**
- * Process markdown.
- *
- * @param string $markdown
- * @access public
- * @return string
- */
- public function processMarkdown($markdown)
- {
- if(empty($markdown)) return false;
-
- $markdown = str_replace('&', '&', $markdown);
-
- $hyperdown = $this->app->loadClass('hyperdown');
- $content = $hyperdown->makeHtml($markdown);
-
- $content = htmlspecialchars_decode($content);
- $content = fixer::stripDataTags($content);
- return $content;
- }
}
diff --git a/module/execution/control.php b/module/execution/control.php
index 5b5eca29ff..50facb576a 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2210,7 +2210,7 @@ class execution extends control
$position[] = html::a($browseExecutionLink, $execution->name);
$position[] = $this->lang->execution->manageProducts;
- $allProducts = $this->product->getProductPairsByProject($execution->project);
+ $allProducts = $this->config->systemMode == 'classic' ? $this->product->getPairs('noclosed') : $this->product->getProductPairsByProject($execution->project);
$linkedProducts = $this->execution->getProducts($execution->id);
$linkedBranches = array();
diff --git a/module/execution/model.php b/module/execution/model.php
index 879450b729..95bedc8efb 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -340,6 +340,12 @@ class executionModel extends model
$sprint = $this->loadModel('file')->processImgURL($sprint, $this->config->execution->editor->create['id'], $this->post->uid);
+ /* Redefines the language entries for the fields in the project table. */
+ foreach(explode(',', $this->config->execution->create->requiredFields) as $field)
+ {
+ if(isset($this->lang->execution->$field)) $this->lang->project->$field = $this->lang->execution->$field;
+ }
+
/* Replace required language. */
if($this->app->openApp == 'project')
{
@@ -484,7 +490,7 @@ class executionModel extends model
}
/* Redefines the language entries for the fields in the project table. */
- foreach(explode(',', $this->config->execution->create->requiredFields) as $field)
+ foreach(explode(',', $this->config->execution->edit->requiredFields) as $field)
{
if(isset($this->lang->execution->$field)) $this->lang->project->$field = $this->lang->execution->$field;
}
@@ -1740,12 +1746,12 @@ class executionModel extends model
{
$this->loadModel('user');
$products = isset($_POST['products']) ? $_POST['products'] : $products;
- $oldProdcuts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->eq((int)$executionID)->fetchGroup('product', 'branch');
+ $oldProducts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->eq((int)$executionID)->fetchGroup('product', 'branch');
$this->dao->delete()->from(TABLE_PROJECTPRODUCT)->where('project')->eq((int)$executionID)->exec();
$members = array_keys($this->getTeamMembers($executionID));
if(empty($products))
{
- $this->user->updateUserView(array_keys($oldProdcuts), 'product', $members);
+ $this->user->updateUserView(array_keys($oldProducts), 'product', $members);
return true;
}
@@ -1760,10 +1766,10 @@ class executionModel extends model
$oldPlan = 0;
$branch = isset($branches[$i]) ? $branches[$i] : 0;
- if(isset($oldProdcuts[$productID][$branch]))
+ if(isset($oldProducts[$productID][$branch]))
{
- $oldProdcuts= $oldProdcuts[$productID][$branch];
- $oldPlan = $oldProdcuts>plan;
+ $oldProduct = $oldProducts[$productID][$branch];
+ $oldPlan = $oldProduct->plan;
}
$data = new stdclass();
@@ -1775,7 +1781,7 @@ class executionModel extends model
$existedProducts[$productID] = true;
}
- $oldProductKeys = array_keys($oldProdcuts);
+ $oldProductKeys = array_keys($oldProducts);
$needUpdate = array_merge(array_diff($oldProductKeys, $products), array_diff($products, $oldProductKeys));
if($needUpdate) $this->user->updateUserView($needUpdate, 'product', $members);
}
diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php
index 2be1f053ac..4bdd443b9b 100644
--- a/module/execution/view/ajaxgetdropmenu.html.php
+++ b/module/execution/view/ajaxgetdropmenu.html.php
@@ -3,9 +3,10 @@
$programProducts)
- - product->mine, '', "data-toggle='tab' class='not-list-item not-clear-menu'");?>
-
-
- product->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?>
-
+
- product->mine, '', "data-toggle='tab' class='not-list-item not-clear-menu'");?>
-
+
- product->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?>
-
@@ -146,10 +147,10 @@ $(function()
$('.nav-tabs li span').hide();
$('.nav-tabs li.active').find('span').show();
- $('.nav-tabs>li').click(function()
+ $('.nav-tabs>li a').click(function()
{
- $(this).find('span').show();
- $(this).siblings('li').find('span').hide();
+ $(this).siblings().show();
+ $(this).parent().siblings('li').find('span').hide();
if($(this).attr('class') != 'active') $('#dropMenu').removeClass('show-right-col');
$("#dropMenu .search-box").width('auto');
})
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 79bab6c722..811ed917a8 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -69,6 +69,7 @@
+
$program):?>
$line):?>
-
+
+
config->systemMode == 'new' and $programID)
{
diff --git a/module/product/view/batchedit.html.php b/module/product/view/batchedit.html.php
index 3c4716187e..4428de2ff6 100755
--- a/module/product/view/batchedit.html.php
+++ b/module/product/view/batchedit.html.php
@@ -52,7 +52,9 @@
$full = '';
}
?>
+ config->systemMode == 'new'):?>
'>product->program;?> |
+
product->name;?> |
'>product->line;?> |
'>product->PO;?> |
@@ -73,9 +75,16 @@
?>
|
+ config->systemMode == 'new'):?>
+ program])):?>
+ ' style='overflow:visible'>program, "class='form-control' disabled");?> |
+
' style='overflow:visible'>program, "class='form-control picker-select' onchange='loadProductLines(this.value, $productID)'");?> |
+
+
name, "class='form-control'");?> |
- ' style='overflow:visible' id="line_">program]) ? $lines[$products[$productID]->program] : '', $products[$productID]->line, "class='form-control picker-select'");?> |
+ program]) ? $lines[$products[$productID]->program] : '';?>
+ ' style='overflow:visible' id="line_">config->systemMode == 'new' ? $productLines : $lines, $products[$productID]->line, "class='form-control picker-select'");?> |
' style='overflow:visible'>PO, "class='form-control picker-select'");?> |
' style='overflow:visible'>QD, "class='form-control picker-select'");?> |
' style='overflow:visible'>RD, "class='form-control picker-select'");?> |
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index fefef34b09..a619913fb7 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -35,7 +35,9 @@
config->systemMode == 'new'):?>
| product->program;?> |
- program, "class='form-control chosen'");?> |
+ app->user->view->programs},", ",{$product->program},") === false ? 'disabled' : '';?>
+ program);?>
+ program, "class='form-control chosen' $attr");?> |
diff --git a/module/program/model.php b/module/program/model.php
index c13ed2f8f4..e09a1da422 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -101,6 +101,22 @@ class programModel extends model
return $program;
}
+ /**
+ * Get program pairs by id list.
+ *
+ * @param string|array $programIDList
+ * @access public
+ * @return void
+ */
+ public function getPairsByList($programIDList = '')
+ {
+ return $this->dao->select('id, name')->from(TABLE_PROGRAM)
+ ->where('id')->in($programIDList)
+ ->andWhere('`type`')->eq('program')
+ ->andWhere('deleted')->eq(0)
+ ->fetchPairs();
+ }
+
/**
* Get program list.
*
@@ -728,7 +744,7 @@ class programModel extends model
/**
* Get parent PM by programIdList.
- *
+ *
* @param array $programIdList
* @access public
* @return void
@@ -739,24 +755,24 @@ class programModel extends model
$parents = array();
foreach($objects as $object)
- {
+ {
if($object->parent == 0) continue;
foreach(explode(',', $object->path) as $objectID)
- {
+ {
if(empty($objectID) || $objectID == $object->id) continue;
$parents[$objectID][] = $object->id;
- }
- }
+ }
+ }
/* Get all parent PM.*/
$parentPM = $this->dao->select('id, PM')->from(TABLE_PROGRAM)->where('id')->in(array_keys($parents))->andWhere('deleted')->eq('0')->fetchAll();
$parentPMGroup = array();
foreach($parentPM as $PM)
- {
+ {
$subPrograms = zget($parents, $PM->id, array());
foreach($subPrograms as $subProgramID) $parentPMGroup[$subProgramID][$PM->PM] = $PM->PM;
- }
+ }
return $parentPMGroup;
}
diff --git a/module/project/control.php b/module/project/control.php
index 9aa49fa019..604e4994a2 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -416,7 +416,6 @@ class project extends control
->where('t1.project')->eq($projectID)
->andWhere('t2.plan')->in(array_keys($oldPlans))
->fetchAll('story');
- $diffResult = array_diff($oldPlans, $_POST['plans']);
$changes = $this->project->update($projectID);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -428,6 +427,7 @@ class project extends control
}
/* Link the plan stories. */
+ $diffResult = array_diff($oldPlans, $_POST['plans']);
if(!empty($_POST['plans']) and !empty($diffResult))
{
$this->loadModel('productplan')->linkProject($projectID, $_POST['plans'], $oldPlanStories);
@@ -471,6 +471,7 @@ class project extends control
$this->view->users = $this->user->getPairs('noclosed|nodeleted');
$this->view->project = $project;
$this->view->programList = $this->program->getParentPairs();
+ $this->view->program = $this->program->getByID($project->parent);
$this->view->projectID = $projectID;
$this->view->allProducts = array('0' => '') + $allProducts;
$this->view->productPlans = $productPlans;
@@ -519,14 +520,23 @@ class project extends control
$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;
+ /* Get program list. */
+ $programs = $this->loadModel('program')->getParentPairs();
+ $unauthorizedIDList = array();
+ foreach($projects as $project)
+ {
+ if(!isset($programs[$project->parent]) and !in_array($project->parent, $unauthorizedIDList)) $unauthorizedIDList[] = $project->parent;
+ $appendPMUsers[$project->PM] = $project->PM;
+ }
+ $unauthorizedPrograms = $this->program->getPairsByList($unauthorizedIDList);
$this->view->title = $this->lang->project->batchEdit;
$this->view->position[] = $this->lang->project->batchEdit;
- $this->view->projects = $projects;
- $this->view->programList = $this->loadModel('program')->getParentPairs();
- $this->view->PMUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst', $appendPMUsers);
+ $this->view->projects = $projects;
+ $this->view->programs = $programs;
+ $this->view->unauthorizedPrograms = $unauthorizedPrograms;
+ $this->view->PMUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst', $appendPMUsers);
$this->display();
}
diff --git a/module/project/model.php b/module/project/model.php
index 3c2f0fcbe3..c6cb2abaa5 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -976,8 +976,8 @@ class projectModel extends model
$projectName = $data->names[$projectID];
$projects[$projectID] = new stdClass();
+ if(isset($data->parents[$projectID])) $projects[$projectID]->parent = $data->parents[$projectID];
$projects[$projectID]->name = $projectName;
- $projects[$projectID]->parent = $data->parents[$projectID];
$projects[$projectID]->PM = $data->PMs[$projectID];
$projects[$projectID]->begin = $data->begins[$projectID];
$projects[$projectID]->end = isset($data->ends[$projectID]) ? $data->ends[$projectID] : LONG_TIME;
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index 8650937e86..a240e49ab3 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -3,10 +3,11 @@