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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/238_wangzemei_68933

Browse Source
This commit is contained in:
wangzemei
2022-09-16 05:44:42 +00:00
parent 4d9d562128 2976f5ce58
commit a022039be1
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/file/view/buildform.html.php
+1 -1
View File
@@ -3,7 +3,7 @@ $maxUploadSize = strtoupper(ini_get('upload_max_filesize'));
js::set('dangerExtensions', ',' . $this->config->file->dangers . ',');
js::set('maxUploadSize', $maxUploadSize);
?>
<div class="file-input-list" data-provide="fileInputList" data-each-file-max-size="<?php echo $maxUploadSize; ?>" data-file-size-error="<?php echo sprintf($lang->file->errorFileSize, $maxUploadSize); ?>">
<div class="file-input-list" data-append-way="before" data-provide="fileInputList" data-each-file-max-size="<?php echo $maxUploadSize; ?>" data-file-size-error="<?php echo sprintf($lang->file->errorFileSize, $maxUploadSize); ?>">
<div class="file-input">
<div class="file-input-edit input-group">
<div class="input-group-cell"><i class="icon icon-paper-clip text-muted"></i></div>
module/product/view/browse.html.php
+2 -2
View File
@@ -48,8 +48,8 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
#productStoryForm #storyList .c-taskCount,
#productStoryForm #storyList .c-actions { border-left: 1px solid #F2F4F7;}
#productStoryForm #storyList .c-actions {overflow: visible;}
#productStoryForm #storyList .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #E4E4E4; margin: 0 4px 0 0;}
#productStoryForm table tbody tr td.c-actions {overflow: visible;}
#productStoryForm table tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #E4E4E4; margin: 0 4px 0 0;}
</style>
<div id="mainMenu" class="clearfix">
<?php if(!$isProjectStory):?>
module/story/lang/zh-cn.php
+1 -1
View File
@@ -106,7 +106,7 @@ $lang->story->moduleAB = '模块';
$lang->story->source = "来源";
$lang->story->sourceNote = '来源备注';
$lang->story->fromBug = '来源Bug';
$lang->story->title = "需求名称";
$lang->story->title = "{$lang->SRCommon}名称";
$lang->story->type = "需求类型";
$lang->story->category = "类别";
$lang->story->color = '标题颜色';
module/story/model.php
+3 -4
View File
@@ -4254,10 +4254,9 @@ class storyModel extends model
$isClick = $this->isClickable($story, 'recall');
$title = $story->status == 'changing' ? $this->lang->story->recallChange : $this->lang->story->recall;
$title = $isClick ? $title : $this->lang->story->recallTip['actived'];
$storyPriv = array(common::hasPriv('story', 'processStoryChange'), common::hasPriv('story', 'change'), common::hasPriv('story', 'submitReview'), common::hasPriv('story', 'review'), common::hasPriv('story', 'close'));
$storyPriv = array(common::hasPriv('story', 'change'), common::hasPriv('story', 'submitReview'), common::hasPriv('story', 'review'), common::hasPriv('story', 'close'));
$storyPrivCount = array_sum($storyPriv);
if(common::hasPriv('story', 'recall') && ($storyPrivCount > 1))
if($this->app->tab == 'product' and common::hasPriv('story', 'recall') && ($storyPrivCount > 1))
{
$menu .= "<div class='btn-group dropup' style='margin-left:-5px;'>";
$menu .= "<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='dropdown' title='{$this->lang->more}' style='width: 16px; padding-left: 0px;'></button>";
@@ -4270,7 +4269,7 @@ class storyModel extends model
}
$menu .= $this->buildMenu('story', 'close', $params . "&from=&storyType=$story->type", $story, $type, '', '', 'iframe', true);
if((common::hasPriv('story', 'recall') or $storyPrivCount > 0) and (common::hasPriv('story', 'edit') or common::hasPriv('story', 'createCase') or common::hasPriv('story', 'batchCreate') or common::hasPriv('projectstory', 'unlinkStory')))
if($this->app->tab == 'product' and (common::hasPriv('story', 'recall') or $storyPrivCount > 0) and (common::hasPriv('story', 'edit') or common::hasPriv('story', 'createCase') or common::hasPriv('story', 'batchCreate')))
{
$menu .= "<div class='dividing-line'></div>";
}
www/theme/default/style.css
+4 -4
View File
@@ -113,7 +113,7 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p
#downloadMobile .dropdown-menu .mobile-version {text-align: center;}
#downloadMobile .dropdown-menu .mobile-version span {color: #0c64eb; font-size: 12px; font-weight: 700;}
#mainMenu > .btn-toolBar > .btn-link > .label-light,
#mainMenu > .btn-toolbar > .btn-link > .label-light {color: #203362; background: #fff;}
#mainMenu > .btn-toolBar > .btn-active-text,
#mainMenu > .btn-toolbar > .btn-active-text {background: #E6EAF1;}
#mainMenu > .btn-toolBar .btn-link .label-light,
#mainMenu > .btn-toolbar .btn-link .label-light {color: #203362; background: #fff;}
#mainMenu > .btn-toolBar .btn-active-text,
#mainMenu > .btn-toolbar .btn-active-text {background: #E6EAF1;}