Merge branch 'sprint/228_tianshujie_64967' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967

This commit is contained in:
tianshujie
2022-08-22 09:24:30 +08:00
2 changed files with 3 additions and 9 deletions
+2 -8
View File
@@ -4533,14 +4533,8 @@ class storyModel extends model
switch($id)
{
case 'id':
if($canBatchAction)
{
echo html::checkbox('storyIdList', array($story->id => '')) . html::a($storyLink, sprintf('%03d', $story->id), '', "data-app='$tab'");
}
else
{
printf('%03d', $story->id);
}
if($canBatchAction) echo html::checkbox('storyIdList', array($story->id => ''));
echo $canView ? html::a($storyLink, sprintf('%03d', $story->id), '', "data-app='$tab'") : sprintf('%03d', $story->id);
break;
case 'order':
echo "<i class='icon-move'>";
+1 -1
View File
@@ -7129,7 +7129,7 @@ class upgradeModel extends model
{
if(empty($this->config->URAndSR)) return false;
$sql = "REPLACE INTO zt_grouppriv SELECT `group`,'requirement' as 'module',`method` FROM `zt_grouppriv` WHERE `module` = 'story' AND `method` in ('create', 'batchEdit', 'edit', 'export', 'delete', 'view', 'change', 'review', 'batchReview', 'recall', 'close', 'batchClose', 'assignTo', 'batchAssignTo', 'activate', 'report', 'linkStory', 'batchChangeBranch', 'batchChangeModule', 'linkStories', 'batchEdit')";
$sql = "REPLACE INTO zt_grouppriv SELECT `group`,'requirement' as 'module',`method` FROM `zt_grouppriv` WHERE `module` = 'story' AND `method` in ('create', 'batchEdit', 'edit', 'export', 'delete', 'view', 'change', 'review', 'batchReview', 'recall', 'close', 'batchClose', 'assignTo', 'batchAssignTo', 'activate', 'report', 'linkStory', 'batchChangeBranch', 'batchChangeModule', 'linkStories', 'batchEdit', 'import', 'exportTemplate')";
$this->dbh->exec($sql);
return true;
}