Merge branch 'importExport' into 'master'

* Sort execution and project gantt menu .

See merge request easycorp/zentaopms!4970

module/common/lang/menu.php

@@ -320,6 +320,9 @@ $lang->execution->menu->task     = array('link' => "{$lang->task->common}|execut
 $lang->execution->menu->kanban   = array('link' => "$lang->executionKanban|execution|taskkanban|executionID=%s");
 $lang->execution->menu->burn     = array('link' => "$lang->burn|execution|burn|executionID=%s");
 $lang->execution->menu->view     = array('link' => "$lang->view|execution|grouptask|executionID=%s", 'alias' => 'grouptask,tree,taskeffort,gantt,calendar,relation,maintainrelation');
+
+if($this->config->edition != 'open') $lang->execution->menu->view = array('link' => "$lang->view|execution|gantt|executionID=%s", 'alias' => 'grouptask,tree,taskeffort,gantt,calendar,relation,maintainrelation');
+
 $lang->execution->menu->story    = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'batchcreate,linkstory,storykanban,batchtotask');
 $lang->execution->menu->qa       = array('link' => "{$lang->qa->common}|execution|bug|executionID=%s", 'subModule' => 'bug,testcase,testtask,testreport', 'alias' => 'qa,bug,testcase,testtask,testreport');
 $lang->execution->menu->devops   = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo');

module/port/model.php

@@ -479,7 +479,7 @@ class portModel extends model
     {
         $getParams = $this->session->{$model . 'PortParams'};
 
-        if($params)
+        if($params and $getParams)
         {
             $params = explode('&', $params);
             foreach($params as $param => $value)
@@ -1305,7 +1305,7 @@ class portModel extends model
                 elseif($field == 'estimate')
                 {
                     $html .= '<td>';
-                    if(is_array($object->estimate))
+                    if(!empty($object->estimate) and is_array($object->estimate))
                     {
                         $html .= "<table class='table-borderless'>";
                         foreach($object->estimate as $account => $estimate)

module/programplan/view/gantt.html.php

@@ -94,7 +94,9 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
       <div class='btn btn-link' id='ganttPris'>
         <strong><?php echo $lang->task->pri . " : "?></strong>
         <?php foreach($lang->execution->gantt->progressColor as $pri => $color):?>
+        <?php if($pri <= 4):?>
         <span style="background:<?php echo $color?>"><?php echo $pri;?></span> &nbsp;
+        <?php endif;?>
         <?php endforeach;?>
       </div>
     </div>