From a64adf09c8b23823c27ea96aaa4eccf55995baf9 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Thu, 21 Apr 2016 16:22:47 +0800
Subject: [PATCH]  * ajust code.

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

diff --git a/module/block/control.php b/module/block/control.php
index 3bb43b0046..6d9e7acb80 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -475,8 +475,11 @@ class block extends control
     public function printStoryBlock()
     {
         $this->app->loadClass('pager', $static = true);
-        $pager = pager::init(0, $this->params->num, 1);
-        $this->view->stories  = $this->loadModel('story')->getUserStories($this->app->user->account, $this->params->type, $this->params->orderBy, $this->viewType != 'json' ? $pager : '');
+        $num     = isset($this->params->num) ? $this->params->num : 0;
+        $pager   = pager::init(0, $num , 1);
+        $type    = isset($this->params->type) ? $this->params->type : 'assignedTo';
+        $orderBy = isset($this->params->type) ? $this->params->orderBy : 'id_asc';
+        $this->view->stories  = $this->loadModel('story')->getUserStories($this->app->user->account, $type, $orderBy, $this->viewType != 'json' ? $pager : '');
     }
 
     /**
@@ -546,7 +549,8 @@ class block extends control
     public function printProductBlock()
     {
         $this->app->loadClass('pager', $static = true);
-        $pager = pager::init(0, $this->params->num, 1);
+        $num   = isset($this->params->num) ? $this->params->num : 0;
+        $pager = pager::init(0, $num , 1);
         $this->view->productStats = $this->loadModel('product')->getStats('order_desc', $this->viewType != 'json' ? $pager : '');
     }
 
@@ -559,7 +563,9 @@ class block extends control
     public function printProjectBlock()
     {
         $this->app->loadClass('pager', $static = true);
-        $pager = pager::init(0, $this->params->num, 1);
-        $this->view->projectStats = $this->loadModel('project')->getProjectStats($this->params->type, $productID = 0, $branch = 0, $itemCounts = 30, $orderBy = 'order_desc', $this->viewType != 'json' ? $pager : '');
+        $num   = isset($this->params->num) ? $this->params->num : 0;
+        $type  = isset($this->params->type) ? $this->params->type : 'all';
+        $pager = pager::init(0, $num, 1);
+        $this->view->projectStats = $this->loadModel('project')->getProjectStats($type, $productID = 0, $branch = 0, $itemCounts = 30, $orderBy = 'order_desc', $this->viewType != 'json' ? $pager : '');
     }
 }
diff --git a/module/custom/model.php b/module/custom/model.php
index dc474a9fd9..fb92e4d58f 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -207,13 +207,13 @@ class customModel extends model
                     if(isset($item['fixed'])) $fixed = $item['fixed'];
                 }
 
-                $hidden = !$fixed && $isSetMenuConfig && $menuConfigMap[$name] && isset($menuConfigMap[$name]->hidden) && $menuConfigMap[$name]->hidden;
+                $hidden = !$fixed && $isSetMenuConfig && isset($menuConfigMap[$name]) && isset($menuConfigMap[$name]->hidden) && $menuConfigMap[$name]->hidden;
 
                 $menuItem = new stdclass();
                 $menuItem->name   = $name;
                 $menuItem->link   = $itemLink;
                 $menuItem->text   = $label;
-                $menuItem->order  = $fixed ? 0 : ($isSetMenuConfig && $menuConfigMap[$name] && isset($menuConfigMap[$name]->order) ? $menuConfigMap[$name]->order : $order++);
+                $menuItem->order  = $fixed ? 0 : ($isSetMenuConfig && isset($menuConfigMap[$name]) && isset($menuConfigMap[$name]->order) ? $menuConfigMap[$name]->order : $order++);
                 if($float)  $menuItem->float   = $float;
                 if($fixed)  $menuItem->fixed   = $fixed;
                 if($hidden) $menuItem->hidden  = $hidden;
@@ -277,10 +277,10 @@ class customModel extends model
         $app->loadLang($module);
 
         $configKey  = 'feature_' . $module . '_' . $method;
-        $menuConfig = $config->menucustom->$configKey;
+        $allMenu    = isset($lang->$module->featurebar[$method]) ? $lang->$module->featurebar[$method] : null;
+        $menuConfig = '';
+        if(isset($config->menucustom->$configKey)) $menuConfig = $config->menucustom->$configKey;
         if(!empty($menuConfig)) $menuConfig = json_decode($menuConfig);
-        $allMenu    = $lang->$module->featurebar[$method];
-
         return $allMenu ? self::buildMenuConfig($allMenu, $menuConfig) : null;
     }