diff --git a/module/doc/view/alllibsbylist.html.php b/module/doc/view/alllibsbylist.html.php
new file mode 100644
index 0000000000..fcd5c50f25
--- /dev/null
+++ b/module/doc/view/alllibsbylist.html.php
@@ -0,0 +1,68 @@
+
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index 8e3c4ceea9..36155a33b8 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -15,6 +15,9 @@
from == 'doc'):?>
+ cookie->browseType == 'bylist'):?>
+
+
diff --git a/module/doc/view/objectlibsbylist.html.php b/module/doc/view/objectlibsbylist.html.php
new file mode 100644
index 0000000000..1e7768410d
--- /dev/null
+++ b/module/doc/view/objectlibsbylist.html.php
@@ -0,0 +1,74 @@
+
diff --git a/module/product/control.php b/module/product/control.php
index 0536959547..0df8c1a293 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -214,6 +214,7 @@ class product extends control
}
$rootID = key($this->products);
+ if($this->session->product) $rootID = $this->session->product;
$this->product->setMenu($this->products, $rootID);
$this->view->title = $this->lang->product->create;
diff --git a/module/product/model.php b/module/product/model.php
index 8a88879390..971ff72fc7 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -352,11 +352,11 @@ class productModel extends model
public function create()
{
$product = fixer::input('post')
- ->setIF($this->post->acl != 'custom', 'whitelist', '')
- ->setDefault('status', 'normal')
- ->setDefault('createdBy', $this->app->user->account)
- ->setDefault('createdDate', helper::now())
- ->setDefault('createdVersion', $this->config->version)
+ ->setIF($this->post->acl != 'custom', 'whitelist', '')
+ ->setDefault('status', 'normal')
+ ->setDefault('createdBy', $this->app->user->account)
+ ->setDefault('createdDate', helper::now())
+ ->setDefault('createdVersion', $this->config->version)
->join('whitelist', ',')
->stripTags($this->config->product->editor->create['id'], $this->config->allowedTags)
->remove('uid')
diff --git a/module/project/control.php b/module/project/control.php
index 6894c34c91..ce5ca4157f 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -2301,7 +2301,7 @@ class project extends control
public function importPlanStories($projectID, $planID)
{
$planStories = $planProducts = array();
- $planStory = $this->loadModel('story')->getPlanStories($planID);
+ $planStory = $this->loadModel('story')->getPlanStories($planID, 'changed,active,reviewing');
if(!empty($planStory))
{
$planStories = array_keys($planStory);
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index b3dabe6868..3e66d14f2d 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -46,16 +46,13 @@
else
{
echo "';
}
diff --git a/module/task/model.php b/module/task/model.php
index bea8fd7a40..104e736e9e 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -822,6 +822,11 @@ class taskModel extends model
->setDefault('assignedDate', $now)
->remove('comment,showModule')
->get();
+ if($oldTask->status != 'done' and $oldTask->status != 'closed' and $task->left == 0)
+ {
+ dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->task->left);
+ return false;
+ }
if(!empty($oldTask->team))
{
diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php
index dca7f7b55c..befb86256e 100644
--- a/module/task/view/assignto.html.php
+++ b/module/task/view/assignto.html.php
@@ -39,10 +39,12 @@
+ status != 'done' and $task->status != 'closed'):?>
|
- |