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

module/bug/view/view.html.php

@@ -19,12 +19,11 @@
 <?php js::set('branchID', $bug->branch);?>
 <?php js::set('errorNoExecution', $lang->bug->noExecution);?>
 <?php js::set('errorNoProject', $lang->bug->noProject);?>
-<?php $browseLink = $app->session->bugList ? $app->session->bugList : inlink('browse', "productID=$bug->product");?>
 <?php if(strpos($_SERVER["QUERY_STRING"], 'isNotice=1') === false):?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php if(!isonlybody()):?>
-    <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary'");?>
+    <?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "btn btn-secondary");?>
     <div class="divider"></div>
     <?php endif;?>
     <div class="page-title">
@@ -92,7 +91,7 @@
     ?>
     <div class='main-actions'>
       <div class="btn-toolbar">
-        <?php common::printBack($browseLink);?>
+        <?php echo html::backButton('<i class="icon icon-back icon-goback"></i> ' . $lang->goback, "id='back' title='{$lang->goback}{$lang->backShortcutKey}'", 'btn');?>
         <?php if(!$bug->deleted):?>
         <div class='divider'></div>
         <?php echo $this->bug->buildOperateMenu($bug, 'view');?>

module/common/view/kindeditor.html.php

@@ -15,6 +15,11 @@ $editorLang   = isset($editorLangs[$app->getClientLang()]) ? $editorLangs[$app->
 /* set uid for upload. */
 $uid = uniqid('');
 ?>
+<style>
+<?php foreach($editor['id'] as $editorID):?>
+<?php echo "textarea#{$editorID} {display:none}";?>
+<?php endforeach?>
+</style>
 <?php js::import($jsRoot . 'kindeditor/kindeditor.min.js'); ?>
 <?php js::import($jsRoot . "kindeditor/lang/{$editorLang}.js");?>
 <script>

module/doc/model.php

@@ -306,6 +306,7 @@ class docModel extends model
                 if($lib->acl == 'private' and $lib->acl == 'custom') $lib->users .= ',' . $libCreatedBy ? $libCreatedBy : $openedBy;
             }
         }
+        if($oldLib->acl != $lib->acl and $lib->acl == 'open') $lib->users = '';
 
         $lib->name = trim($lib->name); //Temporary treatment: Code for bug #15528.
         $this->dao->update(TABLE_DOCLIB)->data($lib)->autoCheck()
@@ -1528,6 +1529,7 @@ class docModel extends model
                     ->where("CONCAT(',', t2.users, ',')")->like("%,{$this->app->user->account},%")
                     ->andWhere('t1.vision')->eq($this->config->vision)
                     ->andWhere('t1.deleted')->eq(0)
+                    ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->projects)->fi()
                     ->fetchPairs();
             }
 

module/product/model.php

@@ -1314,7 +1314,7 @@ class productModel extends model
             ->fetchAll('id');
 
         /* Determine how to display the name of the program. */
-        $programList = $this->loadModel('program')->getParentPairs('', '');
+        $programList = $this->loadModel('program')->getParentPairs('', 'all');
         foreach($projectList as $id => $project)
         {
             $projectList[$id]->programName = $project->parent ? zget($programList, $project->parent, '') : '';

module/program/model.php

@@ -1250,7 +1250,7 @@ class programModel extends model
      * Get program parent pairs
      *
      * @param  string $model
-     * @param  string $mode
+     * @param  string $mode       noclosed|all
      * @param  bool   $showRoot
      * @access public
      * @return array
@@ -1268,7 +1268,7 @@ class programModel extends model
         $treeMenu = array();
         foreach($modules as $module)
         {
-            if(strpos(",{$this->app->user->view->programs},", ",{$module->id},") === false and (!$this->app->user->admin)) continue;
+            if(strpos($mode, 'all') !== false and strpos(",{$this->app->user->view->programs},", ",{$module->id},") === false and (!$this->app->user->admin)) continue;
 
             $moduleName    = $showRoot ? '/' : '';
             $parentModules = explode(',', $module->path);

module/report/model.php

@@ -516,9 +516,12 @@ class reportModel extends model
         return $this->dao->select('t1.id, t1.name, t2.account as user, t1.deadline')->from(TABLE_TASK)->alias('t1')
             ->leftJoin(TABLE_USER)->alias('t2')->on('t1.assignedTo = t2.account')
             ->leftJoin(TABLE_EXECUTION)->alias('t3')->on('t1.execution = t3.id')
+            ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.project = t4.id')
             ->where('t1.assignedTo')->ne('')
             ->andWhere('t1.deleted')->eq(0)
             ->andWhere('t2.deleted')->eq(0)
+            ->andWhere('t3.deleted')->eq(0)
+            ->andWhere('t4.deleted')->eq(0)
             ->andWhere('t1.status')->in('wait,doing')
             ->andWhere('t3.status')->ne('suspended')
             ->andWhere('t1.deadline', true)->eq('0000-00-00')