Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
superrain51
apollo
提交
21492011
apollo
项目概览
superrain51
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
21492011
编写于
1月 20, 2017
作者:
J
Jason Song
提交者:
GitHub
1月 20, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #522 from lepdou/fix_0119
add emergency publish confirm dialog
上级
5b2072cd
a9047e47
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
39 addition
and
16 deletion
+39
-16
apollo-portal/src/main/resources/static/config.html
apollo-portal/src/main/resources/static/config.html
+5
-1
apollo-portal/src/main/resources/static/scripts/controller/config/ConfigNamespaceController.js
...ic/scripts/controller/config/ConfigNamespaceController.js
+25
-0
apollo-portal/src/main/resources/static/scripts/directive/publish-deny-modal-directive.js
.../static/scripts/directive/publish-deny-modal-directive.js
+7
-14
apollo-portal/src/main/resources/static/scripts/services/EventManager.js
...rc/main/resources/static/scripts/services/EventManager.js
+2
-1
未找到文件。
apollo-portal/src/main/resources/static/config.html
浏览文件 @
21492011
...
...
@@ -229,7 +229,7 @@
cluster=
"pageContext.clusterName"
>
</mergeandpublishmodal>
<publishdenymodal></publishdenymodal>
<publishdenymodal
env=
"pageContext.env"
></publishdenymodal>
<apolloconfirmdialog
apollo-dialog-id=
"'deleteConfirmDialog'"
apollo-title=
"'删除配置'"
apollo-detail=
"'确定要删除配置吗?'"
...
...
@@ -256,6 +256,10 @@
apollo-detail=
"'确定要回滚吗?'"
apollo-show-cancel-btn=
"true"
apollo-confirm=
"rollback"
></apolloconfirmdialog>
<apolloconfirmdialog
apollo-dialog-id=
"'emergencyPublishAlertDialog'"
apollo-title=
"'紧急发布'"
apollo-detail=
"'确定要紧急发布吗?'"
apollo-show-cancel-btn=
"true"
apollo-confirm=
"emergencyPublish"
></apolloconfirmdialog>
<apolloconfirmdialog
apollo-dialog-id=
"'deleteBranchDialog'"
apollo-title=
"'删除灰度'"
apollo-detail=
"'删除灰度会丢失灰度的配置,确定要删除吗?'"
apollo-show-cancel-btn=
"true"
apollo-confirm=
"deleteBranch"
></apolloconfirmdialog>
...
...
apollo-portal/src/main/resources/static/scripts/controller/config/ConfigNamespaceController.js
浏览文件 @
21492011
...
...
@@ -19,6 +19,7 @@ function controller($rootScope, $scope, toastr, AppUtil, EventManager, ConfigSer
$scope
.
deleteBranch
=
deleteBranch
;
$scope
.
showNoModifyPermissionDialog
=
showNoModifyPermissionDialog
;
$scope
.
lockCheck
=
lockCheck
;
$scope
.
emergencyPublish
=
emergencyPublish
;
init
();
...
...
@@ -312,6 +313,30 @@ function controller($rootScope, $scope, toastr, AppUtil, EventManager, ConfigSer
}
EventManager
.
subscribe
(
EventManager
.
EventType
.
EMERGENCY_PUBLISH
,
function
(
context
)
{
AppUtil
.
showModal
(
"
#emergencyPublishAlertDialog
"
);
$scope
.
emergencyPublishContext
=
context
;
});
function
emergencyPublish
()
{
if
(
$scope
.
emergencyPublishContext
.
mergeAndPublish
)
{
EventManager
.
emit
(
EventManager
.
EventType
.
MERGE_AND_PUBLISH_NAMESPACE
,
{
branch
:
$scope
.
emergencyPublishContext
.
namespace
,
isEmergencyPublish
:
true
});
}
else
{
EventManager
.
emit
(
EventManager
.
EventType
.
PUBLISH_NAMESPACE
,
{
namespace
:
$scope
.
emergencyPublishContext
.
namespace
,
isEmergencyPublish
:
true
});
}
}
new
Clipboard
(
'
.clipboard
'
);
}
...
...
apollo-portal/src/main/resources/static/scripts/directive/publish-deny-modal-directive.js
浏览文件 @
21492011
...
...
@@ -7,6 +7,7 @@ function publishDenyDirective(AppUtil, EventManager) {
transclude
:
true
,
replace
:
true
,
scope
:
{
env
:
"
=
"
},
link
:
function
(
scope
)
{
var
MODAL_ID
=
"
#publishDenyModal
"
;
...
...
@@ -21,20 +22,12 @@ function publishDenyDirective(AppUtil, EventManager) {
function
emergencyPublish
()
{
AppUtil
.
hideModal
(
MODAL_ID
);
if
(
scope
.
mergeAndPublish
)
{
EventManager
.
emit
(
EventManager
.
EventType
.
MERGE_AND_PUBLISH_NAMESPACE
,
{
branch
:
scope
.
toReleaseNamespace
,
isEmergencyPublish
:
true
});
}
else
{
EventManager
.
emit
(
EventManager
.
EventType
.
PUBLISH_NAMESPACE
,
{
namespace
:
scope
.
toReleaseNamespace
,
isEmergencyPublish
:
true
});
}
EventManager
.
emit
(
EventManager
.
EventType
.
EMERGENCY_PUBLISH
,
{
mergeAndPublish
:
scope
.
mergeAndPublish
,
namespace
:
scope
.
toReleaseNamespace
});
}
}
...
...
apollo-portal/src/main/resources/static/scripts/services/EventManager.js
浏览文件 @
21492011
...
...
@@ -132,7 +132,8 @@ appService.service('EventManager', [function () {
ROLLBACK_NAMESPACE
:
'
rollback_namespace
'
,
EDIT_GRAY_RELEASE_RULES
:
'
edit_gray_release_rules
'
,
UPDATE_GRAY_RELEASE_RULES
:
'
update_gray_release_rules
'
,
PUBLISH_DENY
:
'
publish_deny
'
PUBLISH_DENY
:
'
publish_deny
'
,
EMERGENCY_PUBLISH
:
'
emergency_publish
'
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录