From 63a1a2601df8149ccca3e66ad7fa4afdaf9be49b Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 23 Oct 2018 16:30:55 +0800
Subject: [PATCH]  * fix for block by priv.

---
 module/block/control.php | 7 +++++++
 module/block/model.php   | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index 7f21578ada..22da2d9a36 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -216,9 +216,16 @@ class block extends control
             if($this->block->initBlock($module)) die(js::reload());
         }
 
+        $acls = $this->app->user->rights['acls'];
         $shortBlocks = $longBlocks = array();
         foreach($blocks as $key => $block)
         {
+            if(!empty($block->source) and !empty($acls['views']) and !isset($acls['views'][$block->source]))
+            {
+                unset($blocks[$key]);
+                continue;
+            }
+
             if($this->config->global->flow == 'onlyStory' and $block->source != 'product' and $block->source != 'todo' and $block->block != 'dynamic') unset($blocks[$key]);
             if($this->config->global->flow == 'onlyTask' and $block->source != 'project' and $block->source != 'todo' and $block->block != 'dynamic') unset($blocks[$key]);
             if($this->config->global->flow == 'onlyTest' and $block->source != 'qa' and $block->source != 'todo' and $block->block != 'dynamic') unset($blocks[$key]);
diff --git a/module/block/model.php b/module/block/model.php
index 3354768d0f..ea26ca8e64 100644
--- a/module/block/model.php
+++ b/module/block/model.php
@@ -207,7 +207,6 @@ class blockModel extends model
     {
         $flow    = isset($this->config->global->flow) ? $this->config->global->flow : 'full';
         $blocks  = $module == 'my' ? $this->lang->block->default[$flow][$module] : $this->lang->block->default[$module];
-        $acls    = $this->app->user->rights['acls'];
         $account = $this->app->user->account;
 
         /* Mark this app has init. */
@@ -215,12 +214,6 @@ class blockModel extends model
         $this->loadModel('setting')->setItem("$account.$module.block.initVersion", $this->config->block->version);
         foreach($blocks as $index => $block)
         {
-            if(!empty($block['source']) and !empty($acls) and !isset($acls['views'][$block['source']]))
-            {
-                unset($blocks[$index]);
-                continue;
-            }
-
             $block['order']   = $index;
             $block['module']  = $module;
             $block['account'] = $account;