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

Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0

Browse Source
This commit is contained in:
wangyidong
2021-06-21 15:10:22 +08:00
parent 205129859f b6b31de401
commit 4c196fc621
7 changed files with 23 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/edit.html.php
+8 -7
View File
@@ -258,25 +258,26 @@ js::set('systemMode' , $config->systemMode);
<th class='thWidth'><?php echo $lang->bug->linkBug;?></th>
<td><?php echo html::a($this->createLink('bug', 'linkBugs', "bugID=$bug->id", '', true), $lang->bug->linkBugs, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");?></td>
</tr>
<?php if(isset($bug->linkBugTitles)):?>
<tr>
<th></th>
<td>
<ul class='list-unstyled'>
<?php
foreach($bug->linkBugTitles as $linkBugID => $linkBugTitle)
if(isset($bug->linkBugTitles))
{
echo "<li><div class='checkbox-primary'>";
echo "<input type='checkbox' checked='checked' name='linkBug[]' value=$linkBugID />";
echo "<label>#{$linkBugID} {$linkBugTitle}</label>";
echo '</div></li>';
foreach($bug->linkBugTitles as $linkBugID => $linkBugTitle)
{
echo "<li><div class='checkbox-primary'>";
echo "<input type='checkbox' checked='checked' name='linkBug[]' value=$linkBugID />";
echo "<label>#{$linkBugID} {$linkBugTitle}</label>";
echo '</div></li>';
}
}
?>
<span id='linkBugsBox'></span>
</ul>
</td>
</tr>
<?php endif;?>
<tr>
<th><?php echo $lang->bug->testtask;?></th>
<td id='testtaskBox'><?php echo html::select('testtask', $testtasks, $bug->testtask, 'class="form-control chosen"');?></td>
module/project/model.php
+1 -1
View File
@@ -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();
module/story/control.php
+11 -1
View File
@@ -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);
module/story/view/view.html.php
-28
View File
@@ -501,34 +501,6 @@
</ul>
</td>
</tr>
<tr>
<th class='thWidth'><?php echo $lang->story->legendLinkStories;?></th>
<td class='pd-0'>
<ul class='list-unstyled'>
<?php
$linkStories = explode(',', $story->linkStories) ;
foreach($linkStories as $linkStoryID)
{
if(isset($story->extraStories[$linkStoryID])) echo '<li>' . html::a($this->createLink('story', 'view', "storyID=$linkStoryID", '', true), "[S] #$linkStoryID " . $story->extraStories[$linkStoryID], '', "class='iframe' data-width='80%'") . '</li>';
}
?>
</ul>
</td>
</tr>
<tr>
<th><?php echo $lang->story->legendChildStories;?></th>
<td class='pd-0'>
<ul class='list-unstyled'>
<?php
$childStories = explode(',', $story->childStories) ;
foreach($childStories as $childStoryID)
{
if(isset($story->extraStories[$childStoryID])) echo '<li>' . html::a($this->createLink('story', 'view', "storyID=$childStoryID", '', true), "#$childStoryID " . $story->extraStories[$childStoryID], '', "class='iframe' data-width='80%'") . '</li>';
}
?>
</ul>
</td>
</tr>
</tbody>
</table>
</div>
module/task/view/create.html.php
+1 -1
View File
@@ -236,7 +236,7 @@
<td colspan='3'>
<div class="input-group">
<?php echo html::select('mailto[]', $execution->acl == 'private' ? $members : $users, str_replace(' ', '', $task->mailto), "class='form-control chosen' data-placeholder='{$lang->chooseUsersToMail}' multiple");?>
<?php echo $this->fetch('my', 'buildContactLists');?>
<?php if($execution->acl != 'private') echo $this->fetch('my', 'buildContactLists');?>
</div>
</td>
</tr>
module/task/view/edit.html.php
+1 -1
View File
@@ -210,7 +210,7 @@
</tr>
<tr>
<th><?php echo $lang->task->realStarted;?></th>
<td><?php echo html::input('realStarted', $task->realStarted, "class='form-control form-datetime'");?></td>
<td><?php echo html::input('realStarted', helper::isZeroDate($task->realStarted) ? helper::now() : $task->realStarted, "class='form-control form-datetime'");?></td>
</tr>
<tr>
<th><?php echo $lang->task->finishedBy;?></th>
www/theme/default/style.css
+1
View File
@@ -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;}