From de9b2e6af475f95db0ec53a18e61c4678656a4db Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 15 May 2017 16:23:44 +0800
Subject: [PATCH]  * adjust for init block.

---
 module/block/lang/en.php    | 98 +++++++++++++++++++++++++++----------
 module/block/lang/zh-cn.php | 98 +++++++++++++++++++++++++++----------
 module/block/model.php      |  3 +-
 3 files changed, 148 insertions(+), 51 deletions(-)

diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index bee61e60d1..178f40a75a 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -93,31 +93,79 @@ $lang->block->default['qa']['3']['params']['num']     = 15;
 $lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc';
 $lang->block->default['qa']['3']['params']['type']    = 'wait';
 
-$lang->block->default['my']['1']['title']  = 'Flowchart';
-$lang->block->default['my']['1']['block']  = 'flowchart';
-$lang->block->default['my']['1']['grid']   = 8;
-$lang->block->default['my']['1']['source'] = '';
-$lang->block->default['my']['2']['title']  = 'Dynamic';
-$lang->block->default['my']['2']['block']  = 'dynamic';
-$lang->block->default['my']['2']['grid']   = 4;
-$lang->block->default['my']['2']['source'] = '';
-$lang->block->default['my']['3'] = $lang->block->default['project']['1'];
-$lang->block->default['my']['3']['source'] = 'project';
-$lang->block->default['my']['4']['title']  = 'My To-Dos';
-$lang->block->default['my']['4']['block']  = 'list';
-$lang->block->default['my']['4']['grid']   = 4;
-$lang->block->default['my']['4']['source'] = 'todo';
-$lang->block->default['my']['4']['params']['num'] = '20';
-$lang->block->default['my']['5'] = $lang->block->default['product']['1'];
-$lang->block->default['my']['5']['source'] = 'product';
-$lang->block->default['my']['6'] = $lang->block->default['project']['2'];
-$lang->block->default['my']['6']['source'] = 'project';
-$lang->block->default['my']['7'] = $lang->block->default['qa']['1'];
-$lang->block->default['my']['7']['source'] = 'qa';
-$lang->block->default['my']['8'] = $lang->block->default['product']['2'];
-$lang->block->default['my']['8']['source'] = 'product';
-$lang->block->default['my']['9'] = $lang->block->default['qa']['2'];
-$lang->block->default['my']['9']['source'] = 'qa';
+$lang->block->default['full']['my']['1']['title']  = 'Flowchart';
+$lang->block->default['full']['my']['1']['block']  = 'flowchart';
+$lang->block->default['full']['my']['1']['grid']   = 8;
+$lang->block->default['full']['my']['1']['source'] = '';
+$lang->block->default['full']['my']['2']['title']  = 'Dynamic';
+$lang->block->default['full']['my']['2']['block']  = 'dynamic';
+$lang->block->default['full']['my']['2']['grid']   = 4;
+$lang->block->default['full']['my']['2']['source'] = '';
+$lang->block->default['full']['my']['3'] = $lang->block->default['project']['1'];
+$lang->block->default['full']['my']['3']['source'] = 'project';
+$lang->block->default['full']['my']['4']['title']  = 'My To-Dos';
+$lang->block->default['full']['my']['4']['block']  = 'list';
+$lang->block->default['full']['my']['4']['grid']   = 4;
+$lang->block->default['full']['my']['4']['source'] = 'todo';
+$lang->block->default['full']['my']['4']['params']['num'] = '20';
+$lang->block->default['full']['my']['5'] = $lang->block->default['product']['1'];
+$lang->block->default['full']['my']['5']['source'] = 'product';
+$lang->block->default['full']['my']['6'] = $lang->block->default['project']['2'];
+$lang->block->default['full']['my']['6']['source'] = 'project';
+$lang->block->default['full']['my']['7'] = $lang->block->default['qa']['1'];
+$lang->block->default['full']['my']['7']['source'] = 'qa';
+$lang->block->default['full']['my']['8'] = $lang->block->default['product']['2'];
+$lang->block->default['full']['my']['8']['source'] = 'product';
+$lang->block->default['full']['my']['9'] = $lang->block->default['qa']['2'];
+$lang->block->default['full']['my']['9']['source'] = 'qa';
+
+$lang->block->default['onlyTest']['my']['1'] = $lang->block->default['qa']['1'];
+$lang->block->default['onlyTest']['my']['1']['source'] = 'qa';
+$lang->block->default['onlyTest']['my']['1']['grid']   = '8';
+$lang->block->default['onlyTest']['my']['2']['title']  = 'Dynamic';
+$lang->block->default['onlyTest']['my']['2']['block']  = 'dynamic';
+$lang->block->default['onlyTest']['my']['2']['grid']   = 4;
+$lang->block->default['onlyTest']['my']['2']['source'] = '';
+$lang->block->default['onlyTest']['my']['3']['title']  = 'My To-Dos';
+$lang->block->default['onlyTest']['my']['3']['block']  = 'list';
+$lang->block->default['onlyTest']['my']['3']['grid']   = 6;
+$lang->block->default['onlyTest']['my']['3']['source'] = 'todo';
+$lang->block->default['onlyTest']['my']['3']['params']['num'] = '20';
+$lang->block->default['onlyTest']['my']['4'] = $lang->block->default['qa']['2'];
+$lang->block->default['onlyTest']['my']['4']['source'] = 'qa';
+$lang->block->default['onlyTest']['my']['4']['grid']   = 6;
+
+$lang->block->default['onlyStory']['my']['1'] = $lang->block->default['project']['1'];
+$lang->block->default['onlyStory']['my']['1']['source'] = 'project';
+$lang->block->default['onlyStory']['my']['1']['grid']   = 8;
+$lang->block->default['onlyStory']['my']['2']['title']  = 'Dynamic';
+$lang->block->default['onlyStory']['my']['2']['block']  = 'dynamic';
+$lang->block->default['onlyStory']['my']['2']['grid']   = 4;
+$lang->block->default['onlyStory']['my']['2']['source'] = '';
+$lang->block->default['onlyStory']['my']['3']['title']  = 'My To-Dos';
+$lang->block->default['onlyStory']['my']['3']['block']  = 'list';
+$lang->block->default['onlyStory']['my']['3']['grid']   = 6;
+$lang->block->default['onlyStory']['my']['3']['source'] = 'todo';
+$lang->block->default['onlyStory']['my']['3']['params']['num'] = '20';
+$lang->block->default['onlyStory']['my']['4'] = $lang->block->default['product']['2'];
+$lang->block->default['onlyStory']['my']['4']['source'] = 'product';
+$lang->block->default['onlyStory']['my']['4']['grid']   = 6;
+
+$lang->block->default['onlyTask']['my']['1'] = $lang->block->default['project']['1'];
+$lang->block->default['onlyTask']['my']['1']['source'] = 'project';
+$lang->block->default['onlyTask']['my']['1']['grid']   = 8;
+$lang->block->default['onlyTask']['my']['2']['title']  = 'Dynamic';
+$lang->block->default['onlyTask']['my']['2']['block']  = 'dynamic';
+$lang->block->default['onlyTask']['my']['2']['grid']   = 4;
+$lang->block->default['onlyTask']['my']['2']['source'] = '';
+$lang->block->default['onlyTask']['my']['3']['title']  = 'My To-Dos';
+$lang->block->default['onlyTask']['my']['3']['block']  = 'list';
+$lang->block->default['onlyTask']['my']['3']['grid']   = 6;
+$lang->block->default['onlyTask']['my']['3']['source'] = 'todo';
+$lang->block->default['onlyTask']['my']['3']['params']['num'] = '20';
+$lang->block->default['onlyTask']['my']['4'] = $lang->block->default['project']['2'];
+$lang->block->default['onlyTask']['my']['4']['source'] = 'project';
+$lang->block->default['onlyTask']['my']['4']['grid']   = 6;
 
 $lang->block->num      = 'Number';
 $lang->block->type     = 'Type';
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index d0167df7f2..4c7a63691b 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -93,31 +93,79 @@ $lang->block->default['qa']['3']['params']['num']     = 15;
 $lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc';
 $lang->block->default['qa']['3']['params']['type']    = 'wait';
 
-$lang->block->default['my']['1']['title']  = '流程图';
-$lang->block->default['my']['1']['block']  = 'flowchart';
-$lang->block->default['my']['1']['grid']   = 8;
-$lang->block->default['my']['1']['source'] = '';
-$lang->block->default['my']['2']['title']  = '最新动态';
-$lang->block->default['my']['2']['block']  = 'dynamic';
-$lang->block->default['my']['2']['grid']   = 4;
-$lang->block->default['my']['2']['source'] = '';
-$lang->block->default['my']['3'] = $lang->block->default['project']['1'];
-$lang->block->default['my']['3']['source'] = 'project';
-$lang->block->default['my']['4']['title']  = '我的待办';
-$lang->block->default['my']['4']['block']  = 'list';
-$lang->block->default['my']['4']['grid']   = 4;
-$lang->block->default['my']['4']['source'] = 'todo';
-$lang->block->default['my']['4']['params']['num'] = '20';
-$lang->block->default['my']['5'] = $lang->block->default['product']['1'];
-$lang->block->default['my']['5']['source'] = 'product';
-$lang->block->default['my']['6'] = $lang->block->default['project']['2'];
-$lang->block->default['my']['6']['source'] = 'project';
-$lang->block->default['my']['7'] = $lang->block->default['qa']['1'];
-$lang->block->default['my']['7']['source'] = 'qa';
-$lang->block->default['my']['8'] = $lang->block->default['product']['2'];
-$lang->block->default['my']['8']['source'] = 'product';
-$lang->block->default['my']['9'] = $lang->block->default['qa']['2'];
-$lang->block->default['my']['9']['source'] = 'qa';
+$lang->block->default['full']['my']['1']['title']  = '流程图';
+$lang->block->default['full']['my']['1']['block']  = 'flowchart';
+$lang->block->default['full']['my']['1']['grid']   = 8;
+$lang->block->default['full']['my']['1']['source'] = '';
+$lang->block->default['full']['my']['2']['title']  = '最新动态';
+$lang->block->default['full']['my']['2']['block']  = 'dynamic';
+$lang->block->default['full']['my']['2']['grid']   = 4;
+$lang->block->default['full']['my']['2']['source'] = '';
+$lang->block->default['full']['my']['3'] = $lang->block->default['project']['1'];
+$lang->block->default['full']['my']['3']['source'] = 'project';
+$lang->block->default['full']['my']['4']['title']  = '我的待办';
+$lang->block->default['full']['my']['4']['block']  = 'list';
+$lang->block->default['full']['my']['4']['grid']   = 4;
+$lang->block->default['full']['my']['4']['source'] = 'todo';
+$lang->block->default['full']['my']['4']['params']['num'] = '20';
+$lang->block->default['full']['my']['5'] = $lang->block->default['product']['1'];
+$lang->block->default['full']['my']['5']['source'] = 'product';
+$lang->block->default['full']['my']['6'] = $lang->block->default['project']['2'];
+$lang->block->default['full']['my']['6']['source'] = 'project';
+$lang->block->default['full']['my']['7'] = $lang->block->default['qa']['1'];
+$lang->block->default['full']['my']['7']['source'] = 'qa';
+$lang->block->default['full']['my']['8'] = $lang->block->default['product']['2'];
+$lang->block->default['full']['my']['8']['source'] = 'product';
+$lang->block->default['full']['my']['9'] = $lang->block->default['qa']['2'];
+$lang->block->default['full']['my']['9']['source'] = 'qa';
+
+$lang->block->default['onlyTest']['my']['1'] = $lang->block->default['qa']['1'];
+$lang->block->default['onlyTest']['my']['1']['source'] = 'qa';
+$lang->block->default['onlyTest']['my']['1']['grid']   = '8';
+$lang->block->default['onlyTest']['my']['2']['title']  = '最新动态';
+$lang->block->default['onlyTest']['my']['2']['block']  = 'dynamic';
+$lang->block->default['onlyTest']['my']['2']['grid']   = 4;
+$lang->block->default['onlyTest']['my']['2']['source'] = '';
+$lang->block->default['onlyTest']['my']['3']['title']  = '我的待办';
+$lang->block->default['onlyTest']['my']['3']['block']  = 'list';
+$lang->block->default['onlyTest']['my']['3']['grid']   = 6;
+$lang->block->default['onlyTest']['my']['3']['source'] = 'todo';
+$lang->block->default['onlyTest']['my']['3']['params']['num'] = '20';
+$lang->block->default['onlyTest']['my']['4'] = $lang->block->default['qa']['2'];
+$lang->block->default['onlyTest']['my']['4']['source'] = 'qa';
+$lang->block->default['onlyTest']['my']['4']['grid']   = '6';
+
+$lang->block->default['onlyStory']['my']['1'] = $lang->block->default['product']['1'];
+$lang->block->default['onlyStory']['my']['1']['source'] = 'product';
+$lang->block->default['onlyStory']['my']['1']['grid']   = '8';
+$lang->block->default['onlyStory']['my']['2']['title']  = '最新动态';
+$lang->block->default['onlyStory']['my']['2']['block']  = 'dynamic';
+$lang->block->default['onlyStory']['my']['2']['grid']   = 4;
+$lang->block->default['onlyStory']['my']['2']['source'] = '';
+$lang->block->default['onlyStory']['my']['3']['title']  = '我的待办';
+$lang->block->default['onlyStory']['my']['3']['block']  = 'list';
+$lang->block->default['onlyStory']['my']['3']['grid']   = 6;
+$lang->block->default['onlyStory']['my']['3']['source'] = 'todo';
+$lang->block->default['onlyStory']['my']['3']['params']['num'] = '20';
+$lang->block->default['onlyStory']['my']['4'] = $lang->block->default['product']['2'];
+$lang->block->default['onlyStory']['my']['4']['source'] = 'product';
+$lang->block->default['onlyStory']['my']['4']['grid']   = '4';
+
+$lang->block->default['onlyTask']['my']['1'] = $lang->block->default['project']['1'];
+$lang->block->default['onlyTask']['my']['1']['source'] = 'project';
+$lang->block->default['onlyTask']['my']['1']['grid']   = '8';
+$lang->block->default['onlyTask']['my']['2']['title']  = '最新动态';
+$lang->block->default['onlyTask']['my']['2']['block']  = 'dynamic';
+$lang->block->default['onlyTask']['my']['2']['grid']   = 4;
+$lang->block->default['onlyTask']['my']['2']['source'] = '';
+$lang->block->default['onlyTask']['my']['3']['title']  = '我的待办';
+$lang->block->default['onlyTask']['my']['3']['block']  = 'list';
+$lang->block->default['onlyTask']['my']['3']['grid']   = 6;
+$lang->block->default['onlyTask']['my']['3']['source'] = 'todo';
+$lang->block->default['onlyTask']['my']['3']['params']['num'] = '20';
+$lang->block->default['onlyTask']['my']['4'] = $lang->block->default['project']['2'];
+$lang->block->default['onlyTask']['my']['4']['source'] = 'project';
+$lang->block->default['onlyTask']['my']['4']['grid']   = 6;
 
 $lang->block->num      = '数量';
 $lang->block->type     = '类型';
diff --git a/module/block/model.php b/module/block/model.php
index 5783ad6477..0f67a6c155 100644
--- a/module/block/model.php
+++ b/module/block/model.php
@@ -146,7 +146,8 @@ class blockModel extends model
      */
     public function initBlock($module)
     {
-        $blocks  = $this->lang->block->default[$module];
+        $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];
         $account = $this->app->user->account;
 
         /* Mark this app has init. */