From fbccbf45b746a46243ec7796ccc2614e80eda565 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 25 Apr 2016 10:55:47 +0800
Subject: [PATCH]  * adjust code for error.

---
 module/my/control.php               | 21 +--------------------
 module/project/css/task.css         |  2 ++
 module/tutorial/control.php         |  2 +-
 module/tutorial/view/index.html.php |  2 +-
 4 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/module/my/control.php b/module/my/control.php
index 3263a65b0d..9621c8e2eb 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -33,26 +33,7 @@ class my extends control
      */
     public function index()
     {
-        $account = $this->app->user->account;
-
-        /* Get project and product stats. */
-        $projectStats = $this->loadModel('project')->getProjectStats();
-        $productStats = $this->loadModel('product')->getStats();
-
-        /* Set the dynamic pager. */
-        $this->app->loadClass('pager', true);
-        $pager = new pager($recTotal = 1000, $this->config->my->dynamicCounts);   // Init the $recTotal var, thus omit one sql query.
-
-        $this->view->projectStats  = $projectStats;
-        $this->view->productStats  = $productStats;
-        $this->view->actions       = $this->loadModel('action')->getDynamic('all', 'all', 'date_desc', $pager);
-        $this->view->todos         = $this->loadModel('todo')->getList('all', $account, 'wait, doing', $this->config->my->todoCounts);
-        $this->view->tasks         = $this->loadModel('task')->getUserTasks($account, 'assignedTo', $this->config->my->taskCounts);
-        $this->view->bugs          = $this->loadModel('bug')->getUserBugPairs($account, false, $this->config->my->bugCounts);
-        $this->view->stories       = $this->loadModel('story')->getUserStoryPairs($account, $this->config->my->storyCounts);
-        $this->view->users         = $this->loadModel('user')->getPairs('noletter|withguest');
-        $this->view->title         = $this->lang->my->common;
-
+        $this->view->title = $this->lang->my->common;
         $this->display();
     }
 
diff --git a/module/project/css/task.css b/module/project/css/task.css
index 52dc43b0a1..bb2b722abf 100644
--- a/module/project/css/task.css
+++ b/module/project/css/task.css
@@ -5,6 +5,8 @@
 #hideButton span{padding:2px 10px; background:url(theme/default/images/main/zt-icons.png) -100px  -161px;}
 #featurebar .f-right .icon-green-task-import {padding:2px 8px; background:url(theme/default/images/main/zt-icons.png) 0px   -82px;}
 .sub-featurebar #querybox {margin:0px;}
+.sub-featurebar #bysearchTab.active {padding:0px;}
+.sub-featurebar #bysearchTab.active:hover {background:#fff;}
 
 .dropdown-menu.with-search {padding-bottom: 34px; min-width: 150px; overflow: hidden; max-height: 305px}
 .dropdown-menu > .menu-search {padding: 0; position: absolute; z-index: 0; bottom: 0; left: 0; right: 0}
diff --git a/module/tutorial/control.php b/module/tutorial/control.php
index 7ebeafb5e9..ec6c526036 100644
--- a/module/tutorial/control.php
+++ b/module/tutorial/control.php
@@ -38,7 +38,7 @@ class tutorial extends control
             $this->loadModel('setting')->setItem("$account.tutorial.tasks.setting", $setting);
             $this->send(array('result' => 'success'));
         }
-        $setting = $this->config->tasks->setting;
+        $setting = isset($this->config->tasks->setting) ? $this->config->tasks->setting : '';
 
         if($this->viewType === 'json')
         {
diff --git a/module/tutorial/view/index.html.php b/module/tutorial/view/index.html.php
index 151133b5f7..069e44fe5b 100644
--- a/module/tutorial/view/index.html.php
+++ b/module/tutorial/view/index.html.php
@@ -101,7 +101,7 @@ $(function()
     var lang         = 
     {
         tagetPageTip: '<?php echo $lang->tutorial->tagetPageTip ?>',
-        target      : '<?php echo $lang->tutorial->taget ?>'
+        target      : '<?php echo $lang->tutorial->target ?>'
     }
 
     console.log('TASKS', tasks);