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

* Finish task #47090 #47098.

Browse Source
This commit is contained in:
liumengyi
2022-01-06 16:56:27 +08:00
parent 6613dc493f
commit b6ea0afcb4
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/js/common.js
+3 -3
View File
@@ -24,12 +24,12 @@ function toggleAcl(acl, type)
if(acl == 'custom')
{
$('#whiteListBox').removeClass('hidden');
$('#groupWhiteListBox').removeClass('hidden');
$('#groupBox').removeClass('hidden');
}
else if(acl == 'private')
{
$('#whiteListBox').removeClass('hidden');
$('#groupWhiteListBox').addClass('hidden');
$('#groupBox').addClass('hidden');
}
else
{
@@ -48,7 +48,7 @@ function toggleAcl(acl, type)
{
link = createLink('doc', 'ajaxGetWhitelist', 'doclibID=' + doclibID + '&acl=' + acl);
$.get(link, function(users)
{
{
$('#users').replaceWith(users);
$('#users_chosen').remove();
$('#users').chosen();
module/doc/view/createlib.html.php
+1 -1
View File
@@ -59,7 +59,7 @@
<tr id='whiteListBox' class='hidden'>
<th><?php echo $lang->doc->whiteList;?></th>
<td>
<div id='groupWhiteListBox' class='input-group'>
<div id='groupBox' class='input-group'>
<span class='input-group-addon groups-addon'><?php echo $lang->doclib->group?></span>
<?php echo html::select('groups[]', $groups, '', "class='form-control chosen' multiple")?>
</div>
module/doc/view/editlib.html.php
+1 -1
View File
@@ -64,7 +64,7 @@
<tr id='whiteListBox' class='hidden'>
<th><?php echo $lang->doc->whiteList?></th>
<td>
<div id='groupWhiteListBox' class='input-group'>
<div id='groupBox' class='input-group'>
<span class='input-group-addon groups-addon'><?php echo $lang->doclib->group?></span>
<?php echo html::select('groups[]', $groups, $lib->groups, "class='form-control chosen' multiple")?>
</div>
module/execution/control.php
+1
View File
@@ -239,6 +239,7 @@ class execution extends control
$this->view->setModule = true;
$this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
$this->view->showBranch = $showBranch;
$this->view->projectName = $this->config->systemMode == 'new' ? $this->loadModel('project')->getById($execution->project)->name . ' / ' . $execution->name : $execution->name;
$this->display();
}
module/execution/view/task.html.php
+1 -2
View File
@@ -182,8 +182,7 @@ body {margin-bottom: 25px;}
<?php if($this->app->getViewType() == 'xhtml'):?>
<div id="xx-title">
<strong>
<?php $projectName = $this->config->systemMode == 'new' ? $this->project->getById($execution->project)->name . ' / ' : '';?>
<?php echo ($projectName . $this->execution->getByID($execution->id)->name);?>
<?php echo $projectName;?>
</strong>
<div class="linkButton" onclick="handleLinkButtonClick()">
<span title="<?php echo $lang->viewDetails;?>">