Merge branch 'cyy_21763' into 'master'

* Fix bug #21763.

See merge request easycorp/zentaopms!2973

module/project/control.php

@@ -749,6 +749,14 @@ class project extends control
         $this->app->loadClass('pager', $static = true);
         $pager = new pager(0, 30, 1);
 
+        /* Check exist extend fields. */
+        $isExtended = false;
+        if(!empty($this->config->bizVersion))
+        {
+            $extend = $this->loadModel('workflowaction')->getByModuleAndAction('project', 'view');
+            if(!empty($extend) and $extend->extensionType == 'extend') $isExtended = true;
+        }
+
         $this->view->title        = $this->lang->project->view;
         $this->view->position     = $this->lang->project->view;
         $this->view->projectID    = $projectID;
@@ -762,6 +770,7 @@ class project extends control
         $this->view->planGroup    = $this->loadModel('execution')->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->view->isExtended   = $isExtended;
 
         $this->display();
     }

module/project/view/view.html.php

@@ -81,11 +81,13 @@
           </div>
         </div>
       </div>
+      <?php if($isExtended):?>
       <div class="col-sm-12">
         <div class='panel'>
           <?php $this->printExtendFields($project, 'div', "position=left&inForm=0");?>
         </div>
       </div>
+      <?php endif;?>
       <div class="col-sm-12">
         <?php $blockHistory = true;?>
         <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=project&objectID=$project->id");?>