Merge branch 'sprint/217_tianshujie_fixbug' into 'master'

Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4612

extension/lite/project/ext/view/create.html.php

@@ -40,10 +40,12 @@
           <th><?php echo $lang->project->name;?></th>
           <td class="col-main"><?php echo html::input('name', $name, "class='form-control' required");?></td>
         </tr>
+        <?php if(!isset($config->setCode) or $config->setCode == 1):?>
         <tr>
           <th><?php echo $lang->project->code;?></th>
           <td><?php echo html::input('code', '', "class='form-control' required");?></td>
         </tr>
+        <?php endif;?>
         <tr>
           <th><?php echo $lang->project->PM;?></th>
           <td><?php echo html::select('PM', $pmUsers, '', "class='form-control chosen'" . (strpos($requiredFields, 'PM') !== false ? ' required' : ''));?></td>

module/company/control.php

@@ -191,7 +191,6 @@ class company extends control
         $this->session->set('riskList',        $uri, 'project');
         $this->session->set('opportunityList', $uri, 'project');
         $this->session->set('trainplanList',   $uri, 'project');
-        $this->session->set('executionList',   $uri, 'execution');
         $this->session->set('taskList',        $uri, 'execution');
         $this->session->set('buildList',       $uri, 'execution');
         $this->session->set('bugList',         $uri, 'qa');

module/my/view/managecontacts.html.php

@@ -20,8 +20,7 @@
     foreach($lists as $id => $listName)
     {
         $listClass = ($id == $listID and $mode == 'edit') ? 'btn btn-block active' : 'btn btn-block';
-        $shareIcon = in_array($id, $globalContacts) ? '<i class="icon icon-share-sign"></i> ' : '';
-        echo html::a(inlink('managecontacts', "listID=$id&mode=edit"), $shareIcon . $listName, '', "class='{$listClass}' title='$listName'");
+        echo html::a(inlink('managecontacts', "listID=$id&mode=edit"), $listName, '', "class='{$listClass}' title='$listName'");
     }
     ?>
     </div>

module/program/model.php

@@ -547,6 +547,24 @@ class programModel extends model
             $path    = $program->path;
         }
 
+        if($queryID)
+        {
+            $query = $this->loadModel('search')->getQuery($queryID);
+            if($query)
+            {
+                $this->session->set('projectQuery', $query->sql);
+                $this->session->set('projectForm', $query->form);
+            }
+            else
+            {
+                $this->session->set('projectQuery', ' 1 = 1');
+            }
+        }
+        else
+        {
+            if($this->session->projectQuery == false) $this->session->set('projectQuery', ' 1 = 1');
+        }
+
         $query       = str_replace('`id`','t1.id', $this->session->projectQuery);
         $projectList = $this->dao->select('distinct t1.*')->from(TABLE_PROJECT)->alias('t1')
             ->leftJoin(TABLE_TEAM)->alias('t2')->on('t1.id=t2.root')

module/project/config.php

@@ -155,7 +155,7 @@ $config->project->search['fields']['lastEditedDate'] = $lang->project->lastEdite
 $config->project->search['fields']['closedDate']     = $lang->project->closedDate;
 
 $config->project->search['params']['name']           = array('operator' => 'include', 'control' => 'input' , 'values' => '');
-$config->project->search['params']['code']           = array('operator' => '='      , 'control' => 'input' , 'values' => '');
+if(!isset($config->setCode) or $config->setCode == 1) $config->project->search['params']['code'] = array('operator' => '=', 'control' => 'input' , 'values' => '');
 $config->project->search['params']['id']             = array('operator' => '='      , 'control' => 'input' , 'values' => '');
 $config->project->search['params']['model']          = array('operator' => '='      , 'control' => 'select', 'values' => $lang->project->modelList);
 $config->project->search['params']['parent']         = array('operator' => '='      , 'control' => 'select', 'values' => '');