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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2015-11-11 14:56:57 +08:00
parent dec039edfb d953088cfb
commit 4f48349475
6 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/update7.3.sql
View File

@@ -28,4 +28,4 @@ ALTER TABLE `zt_story` ADD `plan` text COLLATE 'utf8_general_ci' NOT NULL AFTER
UPDATE `zt_story` SET `plan`='' WHERE `plan`='0';
ALTER TABLE `zt_release` DROP INDEX `name`;
ALTER TABLE `zt_user` ADD `bindRanzhi` char(30) COLLATE 'utf8_general_ci' NOT NULL AFTER `locked`;
ALTER TABLE `zt_user` ADD `ranzhi` char(30) COLLATE 'utf8_general_ci' NOT NULL AFTER `locked`;

5
module/release/lang/en.php
View File

@@ -62,5 +62,8 @@ $lang->release->statusList[''] = '';
$lang->release->statusList['normal'] = 'Normal';
$lang->release->statusList['terminate'] = 'Terminate';
$lang->release->changeStatusList['normal'] = 'Activate';
$lang->release->changeStatusList['terminate'] = 'Terminate';
$lang->release->action = new stdclass();
$lang->release->action->changestatus = array('main' => '$date, $extra By <strong>$actor</strong>.', 'extra' => 'statusList');
$lang->release->action->changestatus = array('main' => '$date, $extra By <strong>$actor</strong>.', 'extra' => 'changeStatusList');

7
module/release/lang/zh-cn.php
View File

@@ -59,8 +59,11 @@ $lang->release->exportTypeList['bug'] = 'Bug';
$lang->release->exportTypeList['leftbug'] = '遗留Bug';
$lang->release->statusList[''] = '';
$lang->release->statusList['normal'] = '正常维护';
$lang->release->statusList['normal'] = '正常';
$lang->release->statusList['terminate'] = '停止维护';
$lang->release->changeStatusList['normal'] = '激活';
$lang->release->changeStatusList['terminate'] = '停止维护';
$lang->release->action = new stdclass();
$lang->release->action->changestatus = array('main' => '$date, 由 <strong>$actor</strong> $extra。', 'extra' => 'statusList');
$lang->release->action->changestatus = array('main' => '$date, 由 <strong>$actor</strong> $extra。', 'extra' => 'changeStatusList');

5
module/release/lang/zh-tw.php
View File

@@ -62,5 +62,8 @@ $lang->release->statusList[''] = '';
$lang->release->statusList['normal'] = '正常維護';
$lang->release->statusList['terminate'] = '停止維護';
$lang->release->changeStatusList['normal'] = '激活';
$lang->release->changeStatusList['terminate'] = '停止維護';
$lang->release->action = new stdclass();
$lang->release->action->changestatus = array('main' => '$date, 由 <strong>$actor</strong> $extra。', 'extra' => 'statusList');
$lang->release->action->changestatus = array('main' => '$date, 由 <strong>$actor</strong> $extra。', 'extra' => 'changeStatusList');

2
module/release/view/browse.html.php
View File

@@ -50,7 +50,7 @@
if(common::hasPriv('release', 'changeStatus'))
{
$changedStatus = $release->status == 'normal' ? 'terminate' : 'normal';
echo html::a(inlink('changeStatus', "releaseID=$release->id&status=$changedStatus"), '<i class="icon-' . ($release->status == 'normal' ? 'pause' : 'play') . '"></i> ', 'hiddenwin', "class='btn-icon' title='{$lang->release->statusList[$changedStatus]}'");
echo html::a(inlink('changeStatus', "releaseID=$release->id&status=$changedStatus"), '<i class="icon-' . ($release->status == 'normal' ? 'pause' : 'play') . '"></i> ', 'hiddenwin', "class='btn-icon' title='{$lang->release->changeStatusList[$changedStatus]}'");
}
common::printIcon('release', 'edit', "release=$release->id", '', 'list');
if(common::hasPriv('release', 'delete'))

2
module/release/view/view.html.php
View File

@@ -32,7 +32,7 @@
if(common::hasPriv('release', 'changeStatus'))
{
$changedStatus = $release->status == 'normal' ? 'terminate' : 'normal';
echo html::a(inlink('changeStatus', "releaseID=$release->id&type=$changedStatus"), '<i class="icon-' . ($release->status == 'normal' ? 'pause' : 'play') . '"></i> ' . $lang->release->statusList[$changedStatus], 'hiddenwin', "class='btn'");
echo html::a(inlink('changeStatus', "releaseID=$release->id&type=$changedStatus"), '<i class="icon-' . ($release->status == 'normal' ? 'pause' : 'play') . '"></i> ' . $lang->release->changeStatusList[$changedStatus], 'hiddenwin', "class='btn'");
}
if(common::hasPriv('release', 'linkStory')) echo html::a(inlink('view', "releaseID=$release->id&type=story&link=true"), '<i class="icon-link"></i> ' . $lang->release->linkStory, '', "class='btn'");
if(common::hasPriv('release', 'linkBug')) echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"), '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn'");