From 1b669c7d7e3382dc900f945a89b091706e85abe8 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Mon, 25 Jun 2018 09:57:25 +0800
Subject: [PATCH 1/4]  * If feedbackView is true, hide side-col.

---
 module/doc/view/alllibs.html.php | 5 +++--
 module/doc/view/browse.html.php  | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/module/doc/view/alllibs.html.php b/module/doc/view/alllibs.html.php
index 570063b3a0..3892458adb 100644
--- a/module/doc/view/alllibs.html.php
+++ b/module/doc/view/alllibs.html.php
@@ -11,8 +11,9 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div class="main-row <?php if($this->from == 'doc') echo 'split-row';?>" id="mainRow">
-  <?php if($this->from == 'doc'):?>
+<?php $spliter = (empty($this->app->user->feedback) && !$this->cookie->feedbackView && $this->from == 'doc') ? true : false;?>
+<div class="main-row <?php if($spliter) echo 'split-row';?>" id="mainRow">
+  <?php if($spliter):?>
   <?php include './side.html.php';?>
   <?php endif;?>
   <div class="main-col" data-min-width="400">
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index 201f04f3d6..37f524b859 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -19,10 +19,10 @@ var browseType = '<?php echo $browseType;?>';
 <?php js::set('libID', $libID);?>
 <?php if($this->from != 'doc') js::set('type', 'doc');?>
 
-<div class="main-row fade <?php if($this->from == 'doc') echo 'split-row';?>" id="mainRow">
-  <?php if($this->from == 'doc'):?>
+<?php $spliter = (empty($this->app->user->feedback) && !$this->cookie->feedbackView && $this->from == 'doc') ? true : false;?>
+<div class="main-row fade <?php if($spliter) echo 'split-row';?>" id="mainRow">
+  <?php if($spliter):?>
   <?php include './side.html.php';?>
-  <div class="col-spliter"></div>
   <?php endif;?>
   <?php if($this->cookie->browseType == 'bygrid'):?>
   <?php include dirname(__FILE__) . '/browsebygrid.html.php';?>

From acab920f414ba7b0d3628d8ae5778fc7f2b3e46d Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Mon, 25 Jun 2018 10:27:43 +0800
Subject: [PATCH 2/4]  * Add all params for dept managers.

---
 module/dept/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/dept/model.php b/module/dept/model.php
index 1db08e49d8..2873382b13 100644
--- a/module/dept/model.php
+++ b/module/dept/model.php
@@ -423,7 +423,7 @@ class deptModel extends model
     public function getDataStructure($rootDeptID = 0) 
     {
         $tree = array_values($this->getSons($rootDeptID));
-        $users = $this->loadModel('user')->getPairs('noletter|noclosed|nodeleted');
+        $users = $this->loadModel('user')->getPairs('noletter|noclosed|nodeleted|all');
         if(count($tree))
         {
             foreach ($tree as $node)

From de5854c184c7799b7d1b19717509df320d5e3920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <admin@lvtao.net>
Date: Mon, 25 Jun 2018 10:31:19 +0800
Subject: [PATCH 3/4] * Fix bug#1928.

---
 module/project/css/view.css | 2 --
 1 file changed, 2 deletions(-)

diff --git a/module/project/css/view.css b/module/project/css/view.css
index 46a4769f59..6c88638b83 100644
--- a/module/project/css/view.css
+++ b/module/project/css/view.css
@@ -7,5 +7,3 @@
 #burnLegend > div:before {content: ' '; display: block; position: absolute; width: 20px; left: 0; top: 8px; height: 2px; background: #EEEEEE;}
 #burnLegend > div.line-real:before {background: #006AF1;}
 
-.panel-heading {padding-right: 55px;}
-

From 4eb7fa395a6487573ea473c04287da36b5decafc Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Mon, 25 Jun 2018 11:25:32 +0800
Subject: [PATCH 4/4] * Finish task #4475

---
 module/testcase/js/create.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/testcase/js/create.js b/module/testcase/js/create.js
index 2cc68c3f0c..d465914bfa 100644
--- a/module/testcase/js/create.js
+++ b/module/testcase/js/create.js
@@ -17,7 +17,6 @@ function setPreview()
 
 $(function()
 {
-    $('#product_chosen .chosen-single').css('max-width', $('#product_chosen').closest('td').width());
     var $searchStories = $('#searchStories');
     var lastSearchFn = false;
     var $searchInput = $('#storySearchInput');