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

Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'

Browse Source 
* fix bug #20476 #20475

See merge request easycorp/zentaopms!2165
This commit is contained in:
王怡栋
2022-03-09 09:15:06 +00:00
parent a57b4c19cb 81851a3648
commit a906254ba5
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/group/ext/lang/en/lite.php
+9
View File
@@ -1,2 +1,11 @@
<?php
include dirname(dirname(__FILE__)) . '/resource.php';
if($this->config->edition != 'open')
{
$lang->resource->company->todo = 'companyTodo';
$lang->resource->company->calendar = 'effortCalendar';
$lang->resource->company->allTodo = 'allTodo';
$lang->resource->company->effort = 'companyEffort';
$lang->resource->company->alleffort = 'allEffort';
}
extension/lite/group/ext/lang/zh-cn/lite.php
+9
View File
@@ -1,2 +1,11 @@
<?php
include dirname(dirname(__FILE__)) . '/resource.php';
if($this->config->edition != 'open')
{
$lang->resource->company->todo = 'companyTodo';
$lang->resource->company->calendar = 'effortCalendar';
$lang->resource->company->allTodo = 'allTodo';
$lang->resource->company->effort = 'companyEffort';
$lang->resource->company->alleffort = 'allEffort';
}
extension/lite/task/ext/view/create.html.php
+1 -1
View File
@@ -95,7 +95,7 @@
<tr>
<th><?php echo $lang->task->story;?></th>
<td colspan='3'>
<span id='storyBox' class="<?php if(!empty($stories)) echo 'hidden';?> "><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('execution', 'linkStory', "executionID=$execution->id"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?></span>
<span id='storyBox' class="<?php if(!empty($stories)) echo 'hidden';?> "><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('execution', 'linkStory', "executionID=$execution->project"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?></span>
<div class='input-group <?php if(empty($stories)) echo "hidden";?>'>
<?php echo html::select('story', array($task->story => empty($stories) ? '': $stories[$task->story]), $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?>
<span class='input-group-btn' id='preview'><a href='#' class='btn iframe'><?php echo $lang->preview;?></a></span>