From 8856efb813b4787bafb0ed4d2f9f420f6ab04b25 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 18 May 2016 16:39:57 +0800
Subject: [PATCH]  * fix bug for all page for project and product.  * fix bug
 for manage tree and dept.

---
 module/dept/view/browse.html.php     | 11 ++++++++---
 module/product/view/all.html.php     |  2 +-
 module/project/view/all.html.php     |  2 +-
 module/tree/view/browse.html.php     |  2 ++
 module/tree/view/browsetask.html.php | 11 ++++++++---
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/module/dept/view/browse.html.php b/module/dept/view/browse.html.php
index ad83fce354..9467fd03b8 100644
--- a/module/dept/view/browse.html.php
+++ b/module/dept/view/browse.html.php
@@ -98,8 +98,7 @@
 $(function()
 {
     var data = $.parseJSON('<?php echo json_encode($tree);?>');
-    var $tree = $('#deptTree').tree(
-    {
+    var options = {
         name: 'deptTree',
         initialState: 'preserve',
         data: data,
@@ -164,7 +163,13 @@ $(function()
                 });
             }
         }
-    });
+    };
+
+    if(<?php echo common::hasPriv('dept', 'updateorder') ? 'false' : 'true' ?>) options.actions["sort"] = false;
+    if(<?php echo common::hasPriv('dept', 'edit') ? 'false' : 'true' ?>) options.actions["edit"] = false;
+    if(<?php echo common::hasPriv('dept', 'delete') ? 'false' : 'true' ?>) options.actions["delete"] = false;
+
+    var $tree = $('#deptTree').tree(options);
 
     var tree = $tree.data('zui.tree');
     if(!tree.store.time) tree.expand($tree.find('li:not(.tree-action-item)').first());
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index bc717e4b63..8d0cbdd7ad 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -37,7 +37,7 @@
 <?php $canOrder = (common::hasPriv('product', 'updateOrder') and strpos($orderBy, 'order') !== false)?>
 <form method='post' action='<?php echo inLink('batchEdit', "productID=$productID");?>' id='productsForm'>
   <table class='table table-condensed table-hover table-striped tablesorter' id='productList'>
-    <?php $vars = "locate=no&productID=$productID&status=$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
+    <?php $vars = "productID=$productID&status=$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
     <thead>
       <tr>
         <th class='w-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
diff --git a/module/project/view/all.html.php b/module/project/view/all.html.php
index 0b35be0ef9..302e2bb608 100644
--- a/module/project/view/all.html.php
+++ b/module/project/view/all.html.php
@@ -29,7 +29,7 @@
 <?php $canOrder = (common::hasPriv('project', 'updateOrder') and strpos($orderBy, 'order') !== false)?>
 <form id='projectsForm' class='form-condensed' method='post' action='<?php echo inLink('batchEdit', "projectID=$projectID");?>'>
 <table class='table table-fixed tablesorter' id='projectList'>
-  <?php $vars = "locate=no&status=$status&projectID=$projectID&orderBy=%s&productID=$productID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
+  <?php $vars = "status=$status&projectID=$projectID&orderBy=%s&productID=$productID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
   <thead>
     <tr>
       <th class='w-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index 68e282aa12..4721df7706 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -185,6 +185,8 @@ $(function()
     };
 
     if(<?php echo common::hasPriv('tree', 'updateorder') ? 'false' : 'true' ?>) options.actions["sort"] = false;
+    if(<?php echo common::hasPriv('tree', 'edit') ? 'false' : 'true' ?>) options.actions["edit"] = false;
+    if(<?php echo common::hasPriv('tree', 'delete') ? 'false' : 'true' ?>) options.actions["delete"] = false;
 
     var $tree = $('#modulesTree').tree(options);
 
diff --git a/module/tree/view/browsetask.html.php b/module/tree/view/browsetask.html.php
index 00fb728537..4b59e564bb 100644
--- a/module/tree/view/browsetask.html.php
+++ b/module/tree/view/browsetask.html.php
@@ -102,8 +102,7 @@
 $(function()
 {
     var data = $.parseJSON('<?php echo json_encode($tree);?>');
-    var $tree = $('#modulesTree').tree(
-    {
+    var options = {
         name: 'tree-project-edit',
         initialState: 'preserve',
         data: data,
@@ -180,7 +179,13 @@ $(function()
                 });
             }
         }
-    });
+    };
+
+    if(<?php echo common::hasPriv('tree', 'updateorder') ? 'false' : 'true' ?>) options.actions["sort"] = false;
+    if(<?php echo common::hasPriv('tree', 'edit') ? 'false' : 'true' ?>) options.actions["edit"] = false;
+    if(<?php echo common::hasPriv('tree', 'delete') ? 'false' : 'true' ?>) options.actions["delete"] = false;
+
+    var $tree = $('#modulesTree').tree(options);
 
     var tree = $tree.data('zui.tree');
     if(!tree.store.time) tree.expand($tree.find('li:not(.tree-action-item)').first());