diff --git a/db/update12.4.1.sql b/db/update12.4.1.sql deleted file mode 100644 index 3f6ade7a75..0000000000 --- a/db/update12.4.1.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE `zt_user` ADD `type` char(30) NOT NULL AFTER `account`; diff --git a/db/update12.4.2.sql b/db/update12.4.2.sql new file mode 100644 index 0000000000..6a2312c954 --- /dev/null +++ b/db/update12.4.2.sql @@ -0,0 +1 @@ +update zt_story set `plan`='' where `plan`=0; diff --git a/module/action/model.php b/module/action/model.php index a62fe1c5ea..9ad34a1a44 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -856,12 +856,6 @@ class actionModel extends model if(strpos($action->objectLabel, '|') !== false) { list($objectLabel, $moduleName, $methodName, $vars) = explode('|', $action->objectLabel); - $action->objectLink = ''; - if(!common::hasPriv($moduleName, $methodName)) - { - unset($actions[$i]); - continue; - } $action->objectLink = helper::createLink($moduleName, $methodName, sprintf($vars, $action->objectID)); if($action->objectType == 'user') $action->objectLink = helper::createLink($moduleName, $methodName, sprintf($vars, $action->objectName)); diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js index 4be23863ba..c5c235e104 100644 --- a/module/block/js/dashboard.js +++ b/module/block/js/dashboard.js @@ -66,6 +66,7 @@ function refreshBlock($panel, afterRefresh) { $panel.children('.panel-move-handler,style,script').remove(); $panel.find('.panel-body,.empty-tip').replaceWith($data); + $panel.find('.iframe').initIframeModal(); } $panel.find('.progress-pie').progressPie(); if($.isFunction(afterRefresh)) diff --git a/module/bug/js/common.js b/module/bug/js/common.js index 90ddf72002..d648f95aa8 100644 --- a/module/bug/js/common.js +++ b/module/bug/js/common.js @@ -496,7 +496,8 @@ function notice() if(typeof(branch) == 'undefined') branch = 0; var link = createLink('release', 'create', 'productID=' + $('#product').val() + '&branch=' + branch); if(typeof(flow) != 'undefined' && flow == 'onlyTest') link = createLink('build', 'create','projectID=' + $('#product').val()); - html += '' + createBuild + ' '; + link += config.requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes'; + html += '' + createBuild + ' '; html += '' + refresh + ''; } else diff --git a/module/bug/model.php b/module/bug/model.php index 4f7829fc60..033fc689e7 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -2494,7 +2494,7 @@ class bugModel extends model $canBatchResolve = common::hasPriv('bug', 'batchResolve'); $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo'); - $canBatchAction = $canBatchEdit or $canBatchConfirm or $canBatchClose or $canBatchActivate or $canBatchChangeBranch or $canBatchChangeModule or $canBatchResolve or $canBatchAssignTo; + $canBatchAction = ($canBatchEdit or $canBatchConfirm or $canBatchClose or $canBatchActivate or $canBatchChangeBranch or $canBatchChangeModule or $canBatchResolve or $canBatchAssignTo); $canView = common::hasPriv('bug', 'view'); diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 7697d91a08..ef3c1b5ab0 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -206,6 +206,17 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow $setting = $this->datatable->getSetting('bug'); $widths = $this->datatable->setFixedFieldWidth($setting); $columns = 0; + + $canBatchEdit = common::hasPriv('bug', 'batchEdit'); + $canBatchConfirm = common::hasPriv('bug', 'batchConfirm'); + $canBatchClose = common::hasPriv('bug', 'batchClose'); + $canBatchActivate = common::hasPriv('bug', 'batchActivate'); + $canBatchChangeBranch = common::hasPriv('bug', 'batchChangeBranch'); + $canBatchChangeModule = common::hasPriv('bug', 'batchChangeModule'); + $canBatchResolve = common::hasPriv('bug', 'batchResolve'); + $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo'); + + $canBatchAction = ($canBatchEdit or $canBatchConfirm or $canBatchClose or $canBatchActivate or $canBatchChangeBranch or $canBatchChangeModule or $canBatchResolve or $canBatchAssignTo); ?> ';?>