* Avoid the change button and recall button are clickable at the same time.

This commit is contained in:
hufangzhou
2021-08-12 17:13:46 +08:00
parent 0cac057998
commit 99de8fa2ce
2 changed files with 5 additions and 2 deletions
+1 -1
View File
@@ -1115,7 +1115,7 @@ class story extends control
$this->story->recall($storyID);
$this->loadModel('action')->create('story', $storyID, 'Recalled');
die(js::reload('parent.parent'));
die(js::locate('parent.parent'));
}
/**
+4 -1
View File
@@ -3514,7 +3514,10 @@ class storyModel extends model
}
}
$allReviewers = $this->dao->select('story,reviewer,result')->from(TABLE_STORYREVIEW)->where('story')->in($storyIdList)->orderBy('version')->fetchGroup('story', 'reviewer');
$allReviewers = $this->dao->select('story,reviewer,result')->from(TABLE_STORY)->alias('t1')
->leftJoin(TABLE_STORYREVIEW)->alias('t2')->on('t1.version=t2.version and t1.id=t2.story')
->where('story')->in($storyIdList)
->fetchGroup('story', 'reviewer');
foreach($allReviewers as $storyID => $reviewerList)
{