diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index f5b6844452..3976f1f790 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -258,25 +258,26 @@ js::set('systemMode' , $config->systemMode);
bug->linkBug;?> |
createLink('bug', 'linkBugs', "bugID=$bug->id", '', true), $lang->bug->linkBugs, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");?> |
- linkBugTitles)):?>
|
|
-
| bug->testtask;?> |
testtask, 'class="form-control chosen"');?> |
diff --git a/module/project/model.php b/module/project/model.php
index c960f1aacd..dbe77c40fc 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -768,7 +768,7 @@ class projectModel extends model
$product->name = $this->post->productName ? $this->post->productName : $project->name;
$product->bind = $this->post->parent ? 0 : 1;
$product->program = $project->parent ? current(array_filter(explode(',', $program->path))) : 0;
- $product->acl = $project->acl = 'open' ? 'open' : 'private';
+ $product->acl = $project->acl == 'open' ? 'open' : 'private';
$product->PO = $project->PM;
$product->createdBy = $this->app->user->account;
$product->createdDate = helper::now();
diff --git a/module/story/control.php b/module/story/control.php
index 0d13439ef8..dfcee44396 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1610,6 +1610,16 @@ class story extends control
$products = $this->product->getPairs();
$queryID = 0;
+ /* Change for requirement story title. */
+ if($story->type == 'story')
+ {
+ $this->lang->story->title = str_replace($this->lang->SRCommon, $this->lang->URCommon, $this->lang->story->title);
+ $this->lang->story->create = str_replace($this->lang->SRCommon, $this->lang->URCommon, $this->lang->story->create);
+ $this->config->product->search['fields']['title'] = $this->lang->story->title;
+ unset($this->config->product->search['fields']['plan']);
+ unset($this->config->product->search['fields']['stage']);
+ }
+
/* Build search form. */
$actionURL = $this->createLink('story', 'linkStory', "storyID=$storyID&type=$type&linkedStoryID=$linkedStoryID&browseType=bySearch&queryID=myQueryID", '', true);
$this->product->buildSearchForm($story->product, $products, $queryID, $actionURL);
@@ -2011,7 +2021,7 @@ class story extends control
}
$story->plan = $plans;
}
- if(isset($relatedStories[$story->duplicateStory])) $story->duplicateStory = $relatedStories[$story->duplicateStory];
+ if(isset($relatedStories[$story->duplicateStory]) and $story->closedReason != 'duplicate') $story->duplicateStory = $relatedStories[$story->duplicateStory];
if(isset($storyLang->priList[$story->pri])) $story->pri = $storyLang->priList[$story->pri];
if(isset($storyLang->statusList[$story->status])) $story->status = $this->processStatus('story', $story);
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 689a8502e2..13bf65c206 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -501,34 +501,6 @@
-
- | story->legendLinkStories;?> |
-
-
- linkStories) ;
- foreach($linkStories as $linkStoryID)
- {
- if(isset($story->extraStories[$linkStoryID])) echo '- ' . html::a($this->createLink('story', 'view', "storyID=$linkStoryID", '', true), "[S] #$linkStoryID " . $story->extraStories[$linkStoryID], '', "class='iframe' data-width='80%'") . '
';
- }
- ?>
-
- |
-
-
- | story->legendChildStories;?> |
-
-
- childStories) ;
- foreach($childStories as $childStoryID)
- {
- if(isset($story->extraStories[$childStoryID])) echo '- ' . html::a($this->createLink('story', 'view', "storyID=$childStoryID", '', true), "#$childStoryID " . $story->extraStories[$childStoryID], '', "class='iframe' data-width='80%'") . '
';
- }
- ?>
-
- |
-
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 508f3f7087..6e3d083976 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -236,7 +236,7 @@
acl == 'private' ? $members : $users, str_replace(' ', '', $task->mailto), "class='form-control chosen' data-placeholder='{$lang->chooseUsersToMail}' multiple");?>
- fetch('my', 'buildContactLists');?>
+ acl != 'private') echo $this->fetch('my', 'buildContactLists');?>
|
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index b750893a97..e1931015f9 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -210,7 +210,7 @@
| task->realStarted;?> |
- realStarted, "class='form-control form-datetime'");?> |
+ realStarted) ? helper::now() : $task->realStarted, "class='form-control form-datetime'");?> |
| task->finishedBy;?> |
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index e32309b018..7342084ebc 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -42,6 +42,7 @@ a.showMoreImage:hover {opacity: 1;}
.chosen-container .chosen-drop{z-index: 1100;}
.table-actions .btn {background: #78bdf5; color: #fff; border-color: #78bdf5}
+.table-actions > .btn-group:first-child > .btn:first-child {border-right: 1px solid #fff}
.table-footer .checked+div .btn, .table-actions .btn:hover {background: #16a8f8; border-color: #16a8f8}
#header #toolbar a {color: #3c4353; font-size: 13px; position: relative;}