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

* fix bug #29723.

Browse Source
This commit is contained in:
王怡栋
2022-11-15 13:19:06 +08:00
parent 66be15c00f
commit bd06ac3570
7 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/message/model.php
View File

@@ -66,6 +66,8 @@ class messageModel extends model
*/
public function send($objectType, $objectID, $actionType, $actionID, $actor = '', $extra = '')
{
if(defined('TUTORIAL')) return;
$objectType = strtolower($objectType);
$messageSetting = $this->config->message->setting;
if(is_string($messageSetting)) $messageSetting = json_decode($messageSetting, true);

8
module/story/js/common.js
View File

@@ -22,7 +22,7 @@ $(function()
$('#saveButton').on('click', function()
{
$('#saveButton').attr('disabled', true);
$('#saveButton').attr('type', 'submit').attr('disabled', true);
$('#saveDraftButton').attr('disabled', true);
var storyStatus = !$('#reviewer').val() || $('#needNotReview').is(':checked') ? 'active' : 'reviewing';
@@ -31,7 +31,7 @@ $(function()
setTimeout(function()
{
$('#saveButton').removeAttr('disabled');
$('#saveButton').attr('type', 'button').removeAttr('disabled');
$('#saveDraftButton').removeAttr('disabled');
}, 1000);
});
@@ -39,7 +39,7 @@ $(function()
$('#saveDraftButton').on('click', function()
{
$('#saveButton').attr('disabled', true);
$('#saveDraftButton').attr('disabled', true);
$('#saveDraftButton').attr('type', 'submit').attr('disabled', true);
storyStatus = 'draft';
if(typeof(page) != 'undefined' && page == 'change') storyStatus = 'changing';
@@ -50,7 +50,7 @@ $(function()
setTimeout(function()
{
$('#saveButton').removeAttr('disabled');
$('#saveDraftButton').removeAttr('disabled');
$('#saveDraftButton').attr('type', 'button').removeAttr('disabled');
}, 1000);
});
})

4
module/story/view/create.html.php
View File

@@ -297,8 +297,12 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
<tr>
<td colspan="5" class="text-center form-actions">
<?php echo html::hidden('type', $type);?>
<?php if(defined('TUTORIAL')):?>
<?php echo html::submitButton();?>
<?php else:?>
<?php echo html::commonButton($lang->save, "id='saveButton'", 'btn btn-primary btn-wide');?>
<?php echo html::commonButton($lang->story->saveDraft, "id='saveDraftButton'", 'btn btn-secondary btn-wide');?>
<?php endif;?>
<?php echo $gobackLink ? html::a($gobackLink, $lang->goback, '', 'class="btn btn-wide"') : html::backButton('', $source == 'bug' ? 'data-app=qa' : '');?>
</td>
</tr>

3
module/tutorial/lang/de.php
View File

@@ -74,3 +74,6 @@ $lang->tutorial->tasks['createTask']['desc'] = "<p>Aufgaben aufteilen: </p><ul><
$lang->tutorial->tasks['createBug'] = array('title' => 'Bug melden');
$lang->tutorial->tasks['createBug']['nav'] = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Bug erstellen');
$lang->tutorial->tasks['createBug']['desc'] = "<p>Bug erstellen: </p><ul><li data-target='nav'>Öffnen <span class='task-nav'> Test <i class='icon icon-angle-right'></i> Bug <i class='icon icon-angle-right'></i> Einen Bug erstellen</span>；</li><li data-target='form'>Tragen Sie die Bug Informationen ein:</li><li data-target='submit'>Speichern</li></ul>";
global $config;
if($config->systemMode == 'light') unset($lang->tutorial->tasks['createProgram']);

3
module/tutorial/lang/en.php
View File

@@ -74,3 +74,6 @@ $lang->tutorial->tasks['createTask']['desc'] = "<p>Task breakdown for a story: <
$lang->tutorial->tasks['createBug'] = array('title' => 'Report Bug');
$lang->tutorial->tasks['createBug']['nav'] = array('app' => 'qa', 'module' => 'bug', 'method' => 'create', 'menuModule' => 'bug', 'menu' => 'bug', 'target' => '.create-bug-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Report Bug');
$lang->tutorial->tasks['createBug']['desc'] = "<p>Report a Bug: </p><ul><li data-target='nav'>Open <span class='task-nav'> Test <i class='icon icon-angle-right'></i> Bug <i class='icon icon-angle-right'></i> Report Bug</span>；</li><li data-target='form'>Fill the form with bug information:</li><li data-target='submit'>Save</li></ul>";
global $config;
if($config->systemMode == 'light') unset($lang->tutorial->tasks['createProgram']);

3
module/tutorial/lang/fr.php
View File

@@ -74,3 +74,6 @@ $lang->tutorial->tasks['createTask']['desc'] = "<p>Task breakdown for a story: <
$lang->tutorial->tasks['createBug'] = array('title' => 'Report Bug');
$lang->tutorial->tasks['createBug']['nav'] = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Report Bug');
$lang->tutorial->tasks['createBug']['desc'] = "<p>Report a Bug: </p><ul><li data-target='nav'>Open <span class='task-nav'> Test <i class='icon icon-angle-right'></i> Bug <i class='icon icon-angle-right'></i> Report Bug</span>；</li><li data-target='form'>Fill the form with bug information:</li><li data-target='submit'>Save</li></ul>";
global $config;
if($config->systemMode == 'light') unset($lang->tutorial->tasks['createProgram']);

3
module/tutorial/lang/zh-cn.php
View File

@@ -74,3 +74,6 @@ $lang->tutorial->tasks['createTask']['desc'] = "<p>将执行{$lang->SRCommon}分
$lang->tutorial->tasks['createBug'] = array('title' => '提Bug');
$lang->tutorial->tasks['createBug']['nav'] = array('app' => 'qa', 'module' => 'bug', 'method' => 'create', 'menuModule' => 'bug', 'menu' => 'bug', 'target' => '.create-bug-btn', 'vars' => 'productID=0', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '提Bug');
$lang->tutorial->tasks['createBug']['desc'] = "<p>在系统中提交一个Bug：</p><ul><li data-target='nav'>打开 <span class='task-nav'> 测试 <i class='icon icon-angle-right'></i> Bug <i class='icon icon-angle-right'></i> 提Bug</span>；</li><li data-target='form'>在表单中填写Bug信息；</li><li data-target='submit'>保存Bug信息。</li></ul>";
global $config;
if($config->systemMode == 'light') unset($lang->tutorial->tasks['createProgram']);