Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

module/execution/control.php

@@ -443,7 +443,7 @@ class execution extends control
         $this->view->browseType  = 'group';
         $this->view->groupBy     = $groupBy;
         $this->view->orderBy     = $groupBy;
-        $this->view->executionID   = $executionID;
+        $this->view->executionID = $executionID;
         $this->view->users       = $users;
         $this->view->moduleID    = 0;
         $this->view->moduleName  = $this->lang->tree->all;
@@ -1873,11 +1873,11 @@ class execution extends control
 
         $this->view->title      = $this->lang->execution->tree;
         $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
-        $this->view->position[] = $this->lang->execution->tree;
-        $this->view->execution    = $execution;
-        $this->view->executionID  = $executionID;
-        $this->view->level      = $type;
-        $this->view->tree       = $this->execution->printTree($tree);
+        $this->view->position[]  = $this->lang->execution->tree;
+        $this->view->execution   = $execution;
+        $this->view->executionID = $executionID;
+        $this->view->level       = $type;
+        $this->view->tree        = $this->execution->printTree($tree);
         $this->display();
     }
 

module/execution/view/grouptask.html.php

@@ -38,9 +38,9 @@
   </div>
   <div class="btn-toolbar pull-right">
     <?php
-    if(!isset($browseType)) $browseType = '';
+    if(!isset($browseType)) $browseType = 'all';
     if(!isset($orderBy))    $orderBy = '';
-    common::printIcon('task', 'report', "execution=$executionID&browseType=$browseType", '', 'button', 'bar-chart muted');
+    common::printIcon('task', 'report', "execution=$executionID&browseType=all", '', 'button', 'bar-chart muted');
     ?>
     <div class="btn-group">
       <button class="btn btn-link" data-toggle="dropdown"><i class="icon icon-export muted"></i> <span class="text"><?php echo $lang->export;?></span> <span class="caret"></span></button>

module/execution/view/tree.html.php

@@ -27,7 +27,7 @@
   </div>
   <div class="btn-toolbar pull-right">
     <?php
-    if(!isset($browseType)) $browseType = '';
+    if(!isset($browseType)) $browseType = 'all';
     if(!isset($orderBy))    $orderBy = '';
     $link = common::hasPriv('task', 'report', $execution) ?  $this->createLink('task', 'report', "execution=$executionID&browseType=$browseType") : '#';
     echo html::a($link, "<i class='icon icon-bar-chart muted'></i> <span class='text'>{$lang->task->reportChart}</span>", '', 'class="btn btn-link"');

module/project/config.php

@@ -8,7 +8,7 @@ $config->project->editor->close    = array('id' => 'comment', 'tools' => 'simple
 $config->project->editor->suspend  = array('id' => 'comment', 'tools' => 'simpleTools');
 $config->project->editor->start    = array('id' => 'comment', 'tools' => 'simpleTools');
 $config->project->editor->activate = array('id' => 'comment', 'tools' => 'simpleTools');
-$config->project->editor->view     = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->project->editor->view     = array('id' => 'lastComment', 'tools' => 'simpleTools');
 
 $config->project->list = new stdclass();
 $config->project->list->exportFields = 'id,name,code,template,product,status,begin,end,budget,PM,end,desc';

module/repo/view/diff.html.php

@@ -28,7 +28,7 @@
     <div class="divider"></div>
     <div class="page-title">
       <?php
-      echo html::a($this->repo->createLink('browse', "repoID=$repoID"), $repo->name, '', "data-app='{$app->openApp}'");
+      echo html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=&objectID=$objectID"), $repo->name, '', "data-app='{$app->openApp}'");
       $paths= explode('/', $entry);
       $fileName = array_pop($paths);
       $postPath = '';

module/stakeholder/view/userissue.html.php

@@ -45,7 +45,7 @@
               <td><?php echo zget($lang->issue->typeList, $issue->type);?></td>
               <td><?php echo zget($lang->issue->severityList, $issue->severity);?></td>
               <td><?php echo $issue->pri;?></td>
-              <td><?php echo zget($lang->issue->resolveMethods, $issue->status);?></td>
+              <td><?php echo zget($lang->issue->statusList, $issue->status);?></td>
               <td><?php echo $issue->createdDate;?></td>
             </tr>
           <?php endforeach;?>

module/upgrade/view/to15guide.html.php

@@ -10,6 +10,14 @@
  * @link        http://www.zentao.net
  */
 ?>
+<?php 
+$mode = 'classic';
+if(isset($config->maxVersion))
+{
+    unset($lang->upgrade->to15Mode['classic']);
+    $mode = 'new';
+}
+?>
 <?php include '../../common/view/header.lite.html.php';?>
 <div class='container'>
   <div class='panel' style='padding:50px; margin:50px 300px;'>
@@ -18,7 +26,7 @@
       <div class='panel-body'>
         <div style='width:600px; margin: auto;'>
           <?php echo $lang->upgrade->to15Desc;?>
-          <?php echo html::radio('mode', $lang->upgrade->to15Mode, 'classic');?>
+          <?php echo html::radio('mode', $lang->upgrade->to15Mode, $mode);?>
           <p> </p>
           <div id='selectedModeTips' class='text-info'><?php echo $lang->upgrade->selectedModeTips['classic'];?></div>
         </div>