Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust code for error.

Browse Source
This commit is contained in:
wangyidong
2016-04-25 10:55:47 +08:00
parent 1e49a490c4
commit fbccbf45b7
4 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
+1 -20
View File
@@ -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();
}
module/project/css/task.css
+2
View File
@@ -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}
module/tutorial/control.php
+1 -1
View File
@@ -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')
{
module/tutorial/view/index.html.php
+1 -1
View File
@@ -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);