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

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

Browse Source
This commit is contained in:
daitingting
2018-07-12 14:38:51 +08:00
parent 73c335b3de 48ec560bdb
commit d9b17a23f4
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/message/css/setting.css
+4 -1
View File
@@ -1,3 +1,6 @@
.checkbox-primary + .checkbox-primary {margin:0px;}
.checkbox-primary {margin:0px; margin-right:10px !important; width:100px;display:inline-block}
.checkbox-primary {margin:0px; margin-right:10px !important; width:120px;display:inline-block}
.checkbox-primary label{white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
div.chosen-container + select + div.chosen-container > .chosen-choices {border-top:0px;}
.table-bordered thead .checkbox-primary{width:200px;}
module/product/view/browse.html.php
+3 -2
View File
@@ -270,8 +270,9 @@
echo "<li class='dropdown-submenu'>";
echo html::a('javascript:;', $lang->story->stageAB, '', "id='stageItem'");
echo "<ul class='dropdown-menu'>";
$lang->story->stageList[''] = $lang->null;
foreach($lang->story->stageList as $key => $stage)
$stageList['verified'] = $lang->story->stageList['verified'];
$stageList['closed'] = $lang->story->stageList['closed'];
foreach($stageList as $key => $stage)
{
$actionLink = $this->createLink('story', 'batchChangeStage', "stage=$key");
echo "<li>" . html::a('#', $stage, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
module/story/model.php
+2 -4
View File
@@ -1040,12 +1040,10 @@ class storyModel extends model
$story->lastEditedDate = $now;
$story->stage = $stage;
/* When stage is verified then only change to released. */
if($oldStory->stage == 'verified' and $story->stage != 'released')
if($stage == 'verified' or $stage == 'closed')
{
$story->stage = 'verified';
$this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq((int)$storyID)->exec();
$this->dao->update(TABLE_STORYSTAGE)->set('stage')->eq('verified')->where('story')->eq((int)$storyID)->exec();
$this->dao->update(TABLE_STORYSTAGE)->set('stage')->eq($stage)->where('story')->eq((int)$storyID)->exec();
if(!dao::isError()) $allChanges[$storyID] = common::createChanges($oldStory, $story);
}
}