+ | report->user;?> |
report->project;?> |
report->task;?> |
report->remain;?> |
@@ -88,19 +88,13 @@
$info):?>
';?>
- createLink('project', 'view', "projectID={$info['projectID']}"), $project);?> |
- |
- |
+ createLink('project', 'view', "projectID={$info['projectID']}"), $project);?> |
+ |
+ |
-
-
- |
-
-
- |
-
-
- |
+ |
+ |
+ |
'; $id ++;?>
diff --git a/module/story/model.php b/module/story/model.php
index 39b3123b75..889cfc1bd7 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2320,6 +2320,11 @@ class storyModel extends model
$title = $story->planTitle;
$class .= ' text-ellipsis';
}
+ if($id == 'sourceNote')
+ {
+ $title = $story->sourceNote;
+ $class .= ' text-ellipsis';
+ }
echo "";
switch($id)
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index ed9f8539fd..c2056d2b03 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -94,7 +94,7 @@
echo "";
}
- if($from == 'project') common::printIcon('task', 'create', "project=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'smile', '', 'showinonlybody');
+ if($from == 'project') common::printIcon('task', 'create', "project=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'plus', '', 'showinonlybody');
echo "";
common::printIcon('story', 'edit', "storyID=$story->id", $story);
diff --git a/module/todo/control.php b/module/todo/control.php
index fb80cbcd48..cefd0c0983 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -340,7 +340,7 @@ class todo extends control
$this->lang->set('menugroup.todo', $from);
}
- $this->view->title = "{$this->lang->todo->common} #$todo->id $todo->name";
+ $this->view->title = $this->app->user->account == $todo->account ? "{$this->lang->todo->common} #$todo->id $todo->name" : $this->lang->todo->common ;
$this->view->position[] = $this->lang->todo->view;
$this->view->todo = $todo;
$this->view->times = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta);
diff --git a/module/todo/model.php b/module/todo/model.php
index 7e93163643..a13192cf59 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -383,14 +383,14 @@ class todoModel extends model
->beginIF($begin)->andWhere('date')->ge($begin)->fi()
->beginIF($end)->andWhere('date')->le($end)->fi()
->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi()
- ->beginIF($status == 'undone')->andWhere('status')->ne('done')->fi()
+ ->beginIF($status == 'undone')->andWhere('status')->notin('done,closed')->fi()
->beginIF($date == 'cycle')->andWhere('cycle')->eq('1')->fi()
->beginIF($date != 'cycle')->andWhere('cycle')->eq('0')->fi()
->orderBy($orderBy)
->beginIF($limit > 0)->limit($limit)->fi()
->page($pager)
->query();
-
+ a($stmt);
/* Set session. */
$sql = explode('WHERE', $this->dao->get());
$sql = explode('ORDER', $sql[1]);
diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php
index 8716008a40..3d4567617c 100644
--- a/module/user/view/create.html.php
+++ b/module/user/view/create.html.php
@@ -25,7 +25,7 @@
|