Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/project/control.php

@@ -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();
     }

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;

module/project/view/batchedit.html.php

@@ -37,7 +37,11 @@
         <?php $aclList = $project->parent ? $lang->program->subAcls : $lang->project->acls;?>
         <tr>
           <td><?php echo sprintf('%03d', $projectID) . html::hidden("projectIdList[$projectID]", $projectID);?></td>
-          <td><?php echo html::select("parents[$projectID]", $programList, $project->parent, "class='form-control chosen' data-id='$projectID' data-name='{$project->name}' data-parent='{$project->parent}'");?></td>
+          <?php if(isset($unauthorizedPrograms[$project->parent])):?>
+          <td><?php echo html::select("parents[$projectID]", $unauthorizedPrograms, $project->parent, "class='form-control chosen' data-id='$projectID' data-name='{$project->name}' data-parent='{$project->parent}' disabled");?></td>
+          <?php else:?>
+          <td><?php echo html::select("parents[$projectID]", $programs, $project->parent, "class='form-control chosen' data-id='$projectID' data-name='{$project->name}' data-parent='{$project->parent}'");?></td>
+          <?php endif;?>
           <td title='<?php echo $project->name;?>'><?php echo html::input("names[$projectID]", $project->name, "class='form-control'");?></td>
           <td><?php echo html::select("PMs[$projectID]", $PMUsers, $project->PM, "class='form-control chosen'");?></td>
           <td>

module/project/view/edit.html.php

@@ -32,7 +32,16 @@
       <table class='table table-form'>
         <tr>
           <th class='w-120px'><?php echo $lang->program->parent;?></th>
-          <td><?php echo html::select('parent', $programList, $project->parent, "class='form-control chosen'");?></td>
+          <?php
+          $attr = '';
+          if(!isset($programList[$project->parent]))
+          {
+              echo html::hidden('parent', $project->parent);
+              $attr        = 'disabled';
+              $programList = array($project->parent => $program->name);
+          }
+          ?>
+          <td><?php echo html::select('parent', $programList, $project->parent, "class='form-control chosen' $attr");?></td>
           <td></td>
           <td></td>
         </tr>