* fix bug for checkPriv method.

This commit is contained in:
wangyidong
2018-09-30 15:59:51 +08:00
parent a856f8d0a3
commit 8c11529b7f
4 changed files with 32 additions and 5 deletions
+22
View File
@@ -1201,6 +1201,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(1, 'project', 'task'),
(1, 'project', 'kanban'),
(1, 'project', 'tree'),
(1, 'project', 'treetask'),
(1, 'project', 'treestory'),
(1, 'project', 'team'),
(1, 'project', 'testtask'),
(1, 'project', 'unlinkMember'),
@@ -1484,6 +1486,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(2, 'project', 'task'),
(2, 'project', 'kanban'),
(2, 'project', 'tree'),
(2, 'project', 'treetask'),
(2, 'project', 'treestory'),
(2, 'project', 'team'),
(2, 'project', 'testtask'),
(2, 'project', 'view'),
@@ -1670,6 +1674,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(3, 'project', 'task'),
(3, 'project', 'kanban'),
(3, 'project', 'tree'),
(3, 'project', 'treetask'),
(3, 'project', 'treestory'),
(3, 'project', 'team'),
(3, 'project', 'testtask'),
(3, 'project', 'view'),
@@ -1929,6 +1935,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(4, 'project', 'task'),
(4, 'project', 'kanban'),
(4, 'project', 'tree'),
(4, 'project', 'treetask'),
(4, 'project', 'treestory'),
(4, 'project', 'team'),
(4, 'project', 'testtask'),
(4, 'project', 'unlinkMember'),
@@ -2176,6 +2184,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(5, 'project', 'task'),
(5, 'project', 'kanban'),
(5, 'project', 'tree'),
(5, 'project', 'treetask'),
(5, 'project', 'treestory'),
(5, 'project', 'team'),
(5, 'project', 'testtask'),
(5, 'project', 'unlinkMember'),
@@ -2431,6 +2441,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(6, 'project', 'task'),
(6, 'project', 'kanban'),
(6, 'project', 'tree'),
(6, 'project', 'treetask'),
(6, 'project', 'treestory'),
(6, 'project', 'team'),
(6, 'project', 'testtask'),
(6, 'project', 'unlinkMember'),
@@ -2661,6 +2673,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(7, 'project', 'task'),
(7, 'project', 'kanban'),
(7, 'project', 'tree'),
(7, 'project', 'treetask'),
(7, 'project', 'treestory'),
(7, 'project', 'team'),
(7, 'project', 'testtask'),
(7, 'project', 'unlinkStory'),
@@ -2892,6 +2906,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(8, 'project', 'task'),
(8, 'project', 'kanban'),
(8, 'project', 'tree'),
(8, 'project', 'treetask'),
(8, 'project', 'treestory'),
(8, 'project', 'team'),
(8, 'project', 'testtask'),
(8, 'project', 'view'),
@@ -3132,6 +3148,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(9, 'project', 'task'),
(9, 'project', 'kanban'),
(9, 'project', 'tree'),
(9, 'project', 'treetask'),
(9, 'project', 'treestory'),
(9, 'project', 'team'),
(9, 'project', 'view'),
(9, 'qa', 'index'),
@@ -3274,6 +3292,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(10, 'project', 'task'),
(10, 'project', 'kanban'),
(10, 'project', 'tree'),
(10, 'project', 'treetask'),
(10, 'project', 'treestory'),
(10, 'project', 'team'),
(10, 'project', 'testtask'),
(10, 'project', 'view'),
@@ -3371,6 +3391,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(11, 'project', 'task'),
(11, 'project', 'kanban'),
(11, 'project', 'tree'),
(11, 'project', 'treetask'),
(11, 'project', 'treestory'),
(11, 'project', 'team'),
(11, 'project', 'testtask'),
(11, 'project', 'view'),
+2 -2
View File
@@ -1070,7 +1070,7 @@ class block extends control
$products = $this->loadModel('product')->getList();
foreach($products as $product)
{
if(!$this->product->checkPriv($product)) continue;
if(!$this->product->checkPriv($product->id)) continue;
if($product->status == 'normal') $normal++;
if($product->status == 'closed') $closed++;
@@ -1094,7 +1094,7 @@ class block extends control
$total = 0;
foreach($projects as $project)
{
if(!$this->project->checkPriv($project)) continue;
if(!$this->project->checkPriv($project->id)) continue;
if(!isset($overview[$project->status])) $overview[$project->status] = 0;
$overview[$project->status]++;
+2 -2
View File
@@ -677,7 +677,7 @@ class blockModel extends model
$products = $mineProducts = $otherProducts = $closedProducts = array();
foreach($productList as $product)
{
if(!$this->app->user->admin and !$this->product->checkPriv($product)) continue;
if(!$this->app->user->admin and !$this->product->checkPriv($product->id)) continue;
if($product->status == 'normal' and $product->PO == $this->app->user->account)
{
$mineProducts[$product->id] = $product;
@@ -713,7 +713,7 @@ class blockModel extends model
$projects = $mineProjects = $otherProjects = $closedProjects = array();
foreach($projectList as $project)
{
if(!$this->app->user->admin and !$this->project->checkPriv($project)) continue;
if(!$this->app->user->admin and !$this->project->checkPriv($project->id)) continue;
if($project->status != 'done' and $project->status != 'closed' and $project->PM == $this->app->user->account)
{
$mineProjects[$project->id] = $project;
+6 -1
View File
@@ -446,7 +446,12 @@ function loadProductBranches(productID)
function loadAssignedTo(projectID)
{
link = createLink('bug', 'ajaxLoadAssignedTo', 'projectID=' + projectID + '&selectedUser=' + $('#assignedTo').val());
$('#assignedToBox').load(link, function(){$('#assignedTo').chosen();});
$.get(link, function(data)
{
$('#assignedTo_chosen').remove();
$('#assignedTo').replaceWith(data);
$('#assignedTo').chosen();
});
}
/**