allCount . $lang->doc->item;?>
diff --git a/module/doc/view/objectlibsbylist.html.php b/module/doc/view/objectlibsbylist.html.php
index e47b0ed9f7..a508769d2b 100644
--- a/module/doc/view/objectlibsbylist.html.php
+++ b/module/doc/view/objectlibsbylist.html.php
@@ -29,7 +29,7 @@
id");?>
id");?>
- | name);?> |
+ name, '', "data-group=$from");?> |
allCount . $lang->doc->item;?> |
diff --git a/module/index/css/index.css b/module/index/css/index.css
index c53d32ef36..02d931cc3d 100644
--- a/module/index/css/index.css
+++ b/module/index/css/index.css
@@ -46,7 +46,7 @@ body.menu-hide {padding-left: 0;}
#userNav>li>.dropdown-menu{left: 100%; bottom: 0; top: auto; width: 140px; text-align: left; background: #3c495c;}
#userNav>li>.dropdown-menu a{color: #fff}
#userNav>li>.dropdown-menu .dropdown-menu{left: 100%; text-align: left; background: #3c495c}
-#userNav>li .lang .dropdown-menu, #userNav>li .theme .dropdown-menu{top: -60px}
+#userNav>li .top .dropdown-menu{top: -60px}
#userNav .dropdown-menu>li>a>.icon { position: initial; display: inline;}
#userNav li.open>a{background:#0c64eb}
#userNav li.divider{opacity: .24; border-top: 1px solid; height: 0px;}
diff --git a/module/index/js/index.js b/module/index/js/index.js
index ad8a34a046..cd9915ffbf 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -67,12 +67,14 @@
var methodLowerCase = methodName.toLowerCase();
if(moduleName === 'doc')
{
- if(link.prj && ['browse', 'create', 'showfiles', 'objectlibs'].includes(methodLowerCase))
+ if(link.prj)
{
- var from = $.cookie('from');
- if(from === 'project') return 'project';
- if(from === 'product') return 'product';
+ if(methodLowerCase === 'objectlibs' && (link.params.from || link.params.$3) == 'product') return 'product';
+
+ return 'project';
}
+
+ if(methodLowerCase === 'browse' && (link.params.from || link.params.$5) == 'product') return 'product';
return 'doc';
}
if(moduleName === 'custom' && ['estimate', 'browsestoryconcept', 'configurescrum'].includes(methodLowerCase))
diff --git a/module/issue/model.php b/module/issue/model.php
index 5c975ed2ba..f8786102f2 100644
--- a/module/issue/model.php
+++ b/module/issue/model.php
@@ -17,12 +17,12 @@ class issueModel extends model
* Create an issue.
*
* @access public
- * @return bool
+ * @return int
*/
public function create()
{
- $now = helper::now();
- $data = fixer::input('post')
+ $now = helper::now();
+ $issue = fixer::input('post')
->add('createdBy', $this->app->user->account)
->add('createdDate', $now)
->add('status', 'unconfirmed')
@@ -33,7 +33,7 @@ class issueModel extends model
->stripTags($this->config->issue->editor->create['id'], $this->config->allowedTags)
->get();
- $this->dao->insert(TABLE_ISSUE)->data($data)->batchCheck($this->config->issue->create->requiredFields, 'notempty')->exec();
+ $this->dao->insert(TABLE_ISSUE)->data($issue)->batchCheck($this->config->issue->create->requiredFields, 'notempty')->exec();
$issueID = $this->dao->lastInsertID();
$this->loadModel('file')->saveUpload('issue', $issueID);
@@ -215,14 +215,14 @@ class issueModel extends model
*
* @param int $issueID
* @access public
- * @return bool
+ * @return array
*/
public function update($issueID)
{
$oldIssue = $this->getByID($issueID);
- $now = helper::now();
- $data = fixer::input('post')
+ $now = helper::now();
+ $issue = fixer::input('post')
->add('editedBy', $this->app->user->account)
->add('editedDate', $now)
->remove('labels,files')
@@ -231,14 +231,14 @@ class issueModel extends model
->stripTags($this->config->issue->editor->edit['id'], $this->config->allowedTags)
->get();
- $this->dao->update(TABLE_ISSUE)->data($data)
+ $this->dao->update(TABLE_ISSUE)->data($issue)
->where('id')->eq($issueID)
->batchCheck($this->config->issue->edit->requiredFields, 'notempty')
->exec();
$this->loadModel('file')->saveUpload('issue', $issueID);
- return common::createChanges($oldIssue, $data);
+ return common::createChanges($oldIssue, $issue);
}
/**
@@ -251,14 +251,18 @@ class issueModel extends model
public function assignTo($issueID)
{
$oldIssue = $this->getByID($issueID);
- $data = fixer::input('post')
+
+ $now = helper::now();
+ $issue = fixer::input('post')
->add('assignedBy', $this->app->user->account)
- ->add('assignedDate', helper::now())
+ ->add('assignedDate', $now)
+ ->add('editedBy', $this->app->user->account)
+ ->add('editedDate', $now)
->get();
- $this->dao->update(TABLE_ISSUE)->data($data)->where('id')->eq($issueID)->exec();
+ $this->dao->update(TABLE_ISSUE)->data($issue)->where('id')->eq($issueID)->exec();
- return common::createChanges($oldIssue, $data);
+ return common::createChanges($oldIssue, $issue);
}
/**
@@ -271,19 +275,21 @@ class issueModel extends model
public function close($issueID)
{
$oldIssue = $this->getByID($issueID);
- $data = fixer::input('post')
+ $issue = fixer::input('post')
->add('closedBy', $this->app->user->account)
->add('status', 'closed')
->add('assignedTo', 'closed')
+ ->add('editedBy', $this->app->user->account)
+ ->add('editedDate', helper::now())
->get();
- $this->dao->update(TABLE_ISSUE)->data($data)->where('id')->eq($issueID)->exec();
+ $this->dao->update(TABLE_ISSUE)->data($issue)->where('id')->eq($issueID)->exec();
- return common::createChanges($oldIssue, $data);
+ return common::createChanges($oldIssue, $issue);
}
/**
- * Cancel an issue.
+ * Confirm an issue.
*
* @param int $issueID
* @access public
@@ -292,10 +298,15 @@ class issueModel extends model
public function confirm($issueID)
{
$oldIssue = $this->getByID($issueID);
- $data = fixer::input('post')->add('status', 'confirmed')->get();
- $this->dao->update(TABLE_ISSUE)->data($data)->where('id')->eq($issueID)->exec();
+ $issue = fixer::input('post')
+ ->add('status', 'confirmed')
+ ->add('editedBy', $this->app->user->account)
+ ->add('editedDate', helper::now())
+ ->get();
- return common::createChanges($oldIssue, $data);
+ $this->dao->update(TABLE_ISSUE)->data($issue)->where('id')->eq($issueID)->exec();
+
+ return common::createChanges($oldIssue, $issue);
}
/**
@@ -308,10 +319,14 @@ class issueModel extends model
public function cancel($issueID)
{
$oldIssue = $this->getByID($issueID);
- $data = fixer::input('post')->add('status', 'canceled')->get();
- $this->dao->update(TABLE_ISSUE)->data($data)->where('id')->eq($issueID)->exec();
+ $issue = fixer::input('post')
+ ->add('status', 'canceled')
+ ->add('editedBy', $this->app->user->account)
+ ->add('editedDate', helper::now())
+ ->get();
+ $this->dao->update(TABLE_ISSUE)->data($issue)->where('id')->eq($issueID)->exec();
- return common::createChanges($oldIssue, $data);
+ return common::createChanges($oldIssue, $issue);
}
/**
@@ -324,13 +339,21 @@ class issueModel extends model
public function activate($issueID)
{
$oldIssue = $this->getByID($issueID);
- $data = fixer::input('post')
+
+ $now = helper::now();
+ $issue = fixer::input('post')
->add('status', 'active')
+ ->add('activateBy', $this->app->user->account)
+ ->add('editedBy', $this->app->user->account)
+ ->add('editedDate', $now)
+ ->add('assignedBy', $this->app->user->account)
+ ->add('assignedDate', $now)
+ ->addIF($this->post->assignedTo == '', 'assignedTo', $this->app->user->account)
->get();
- $this->dao->update(TABLE_ISSUE)->data($data)->where('id')->eq($issueID)->exec();
+ $this->dao->update(TABLE_ISSUE)->data($issue)->where('id')->eq($issueID)->exec();
- return common::createChanges($oldIssue, $data);
+ return common::createChanges($oldIssue, $issue);
}
/**
@@ -383,7 +406,7 @@ class issueModel extends model
* @param int $issueID
* @param object $data
* @access public
- * @return object
+ * @return void
*/
public function resolve($issueID, $data)
{
@@ -393,6 +416,8 @@ class issueModel extends model
$issue->resolvedBy = $data->resolvedBy;
$issue->resolvedDate = $data->resolvedDate;
$issue->status = 'resolved';
+ $issue->editedBy = $this->app->user->account;
+ $issue->editedDate = helper::now();
$this->dao->update(TABLE_ISSUE)->data($issue)->where('id')->eq($issueID)->exec();
}
diff --git a/module/issue/view/activate.html.php b/module/issue/view/activate.html.php
index 70c9d980d0..529ee9ee98 100644
--- a/module/issue/view/activate.html.php
+++ b/module/issue/view/activate.html.php
@@ -23,8 +23,8 @@
|