Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Catouse
2018-06-25 11:38:19 +08:00
parent 0e0374c414 4eb7fa395a
commit 1a0cd36e0d
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/dept/model.php
+1 -1
View File
@@ -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)
module/doc/view/alllibs.html.php
+3 -2
View File
@@ -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">
module/doc/view/browse.html.php
+3 -3
View File
@@ -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';?>
module/project/css/view.css
-2
View File
@@ -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;}
module/testcase/js/create.js
-1
View File
@@ -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');