Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
superrain51
apollo
提交
c4967e8d
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,发现更多精彩内容 >>
提交
c4967e8d
编写于
9月 20, 2016
作者:
J
Jason Song
提交者:
GitHub
9月 20, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #415 from lepdou/bugfix_0920
bugfix: update other cluster's item
上级
15e41ed3
9936e2f2
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
80 addition
and
78 deletion
+80
-78
apollo-portal/src/main/resources/static/scripts/controller/config/ConfigNamespaceController.js
...ic/scripts/controller/config/ConfigNamespaceController.js
+80
-78
未找到文件。
apollo-portal/src/main/resources/static/scripts/controller/config/ConfigNamespaceController.js
浏览文件 @
c4967e8d
...
...
@@ -24,7 +24,7 @@ application_module.controller("ConfigNamespaceController",
$scope
.
prepareReleaseNamespace
=
prepareReleaseNamespace
;
$scope
.
release
=
release
;
$scope
.
switchReleaseChangeViewType
=
switchReleaseChangeViewType
;
$scope
.
showRollbackAlertDialog
=
showRollbackAlertDialog
;
...
...
@@ -38,22 +38,22 @@ application_module.controller("ConfigNamespaceController",
$scope
.
deleteItem
=
deleteItem
;
$scope
.
editItem
=
editItem
;
$scope
.
createItem
=
createItem
;
$scope
.
doItem
=
doItem
;
$scope
.
closeTip
=
closeTip
;
$scope
.
showText
=
showText
;
$scope
.
releaseBtnDisabled
=
false
;
$scope
.
rollbackBtnDisabled
=
false
;
$scope
.
addItemBtnDisabled
=
false
;
$scope
.
commitChangeBtnDisabled
=
false
;
init
();
function
init
()
{
PermissionService
.
get_app_role_users
(
$rootScope
.
pageContext
.
appId
)
.
then
(
function
(
result
)
{
...
...
@@ -69,10 +69,8 @@ application_module.controller("ConfigNamespaceController",
UserService
.
load_user
().
then
(
function
(
result
)
{
$scope
.
currentUser
=
result
.
userId
;
});
}
}
function
refreshNamespaces
(
viewType
)
{
if
(
$rootScope
.
pageContext
.
env
==
''
)
{
...
...
@@ -85,7 +83,7 @@ application_module.controller("ConfigNamespaceController",
function
(
result
)
{
$scope
.
namespaces
=
result
;
},
function
(
result
)
{
toastr
.
error
(
AppUtil
.
errorMsg
(
result
),
"
加载配置信息出错
"
);
});
...
...
@@ -162,7 +160,7 @@ application_module.controller("ConfigNamespaceController",
}
);
}
$scope
.
releaseChangeViewType
=
'
change
'
;
function
switchReleaseChangeViewType
(
type
)
{
$scope
.
releaseChangeViewType
=
type
;
...
...
@@ -173,7 +171,6 @@ application_module.controller("ConfigNamespaceController",
$
(
"
#rollbackAlertDialog
"
).
modal
(
'
show
'
);
}
$scope
.
toRollbackNamespace
=
{};
function
preRollback
(
namespace
)
{
$scope
.
toRollbackNamespace
=
namespace
;
...
...
@@ -181,7 +178,8 @@ application_module.controller("ConfigNamespaceController",
ReleaseService
.
findActiveReleases
(
$rootScope
.
pageContext
.
appId
,
$rootScope
.
pageContext
.
env
,
$rootScope
.
pageContext
.
clusterName
,
$scope
.
toRollbackNamespace
.
baseInfo
.
namespaceName
,
0
,
2
)
$scope
.
toRollbackNamespace
.
baseInfo
.
namespaceName
,
0
,
2
)
.
then
(
function
(
result
)
{
if
(
result
.
length
<=
1
)
{
toastr
.
error
(
"
没有可以回滚的发布历史
"
);
...
...
@@ -208,8 +206,8 @@ application_module.controller("ConfigNamespaceController",
function
rollback
()
{
$scope
.
rollbackBtnDisabled
=
true
;
ReleaseService
.
rollback
(
$rootScope
.
pageContext
.
env
,
$scope
.
firstRelease
.
id
)
$rootScope
.
pageContext
.
env
,
$scope
.
firstRelease
.
id
)
.
then
(
function
(
result
)
{
toastr
.
success
(
"
回滚成功
"
);
$scope
.
rollbackBtnDisabled
=
false
;
...
...
@@ -262,7 +260,7 @@ application_module.controller("ConfigNamespaceController",
$
(
"
#itemModal
"
).
modal
(
"
show
"
);
}
//新增配置
function
createItem
(
namespace
)
{
if
(
!
lockCheck
(
namespace
))
{
...
...
@@ -290,63 +288,65 @@ application_module.controller("ConfigNamespaceController",
if
(
selectedClusters
.
length
==
0
)
{
toastr
.
error
(
"
请选择集群
"
);
}
else
{
if
(
!
$scope
.
item
.
value
)
{
$scope
.
item
.
value
=
""
;
return
;
}
if
(
!
$scope
.
item
.
value
)
{
$scope
.
item
.
value
=
""
;
}
if
(
$scope
.
tableViewOperType
==
TABLE_VIEW_OPER_TYPE
.
CREATE
)
{
//check key unique
var
hasRepeatKey
=
false
;
toOperationNamespace
.
items
.
forEach
(
function
(
item
)
{
if
(
!
item
.
isDeleted
&&
$scope
.
item
.
key
==
item
.
item
.
key
)
{
toastr
.
error
(
"
key=
"
+
$scope
.
item
.
key
+
"
已存在
"
);
hasRepeatKey
=
true
;
return
;
}
});
if
(
hasRepeatKey
)
{
return
;
}
$scope
.
addItemBtnDisabled
=
true
;
selectedClusters
.
forEach
(
function
(
cluster
)
{
if
(
$scope
.
tableViewOperType
==
TABLE_VIEW_OPER_TYPE
.
CREATE
)
{
//check key unique
var
hasRepeatKey
=
false
;
toOperationNamespace
.
items
.
forEach
(
function
(
item
)
{
if
(
!
item
.
isDeleted
&&
$scope
.
item
.
key
==
item
.
item
.
key
)
{
toastr
.
error
(
"
key=
"
+
$scope
.
item
.
key
+
"
已存在
"
);
hasRepeatKey
=
true
;
return
;
}
ConfigService
.
create_item
(
$rootScope
.
pageContext
.
appId
,
cluster
.
env
,
cluster
.
name
,
toOperationNamespace
.
baseInfo
.
namespaceName
,
$scope
.
item
).
then
(
function
(
result
)
{
toastr
.
success
(
cluster
.
env
+
"
,
"
+
$scope
.
item
.
key
,
"
添加成功
"
);
},
function
(
result
)
{
toastr
.
error
(
AppUtil
.
errorMsg
(
result
),
"
添加失败
"
);
});
if
(
hasRepeatKey
)
{
return
;
}
$scope
.
addItemBtnDisabled
=
true
;
ConfigService
.
create_item
(
$rootScope
.
pageContext
.
appId
,
cluster
.
env
,
cluster
.
name
,
toOperationNamespace
.
baseInfo
.
namespaceName
,
$scope
.
item
).
then
(
function
(
result
)
{
toastr
.
success
(
cluster
.
env
+
"
,
"
+
$scope
.
item
.
key
,
"
添加成功
"
);
itemModal
.
modal
(
'
hide
'
);
$scope
.
addItemBtnDisabled
=
false
;
$rootScope
.
refreshNamespaces
(
namespace_view_type
.
TABLE
);
},
function
(
result
)
{
$scope
.
addItemBtnDisabled
=
false
;
toastr
.
error
(
AppUtil
.
errorMsg
(
result
),
"
添加失败
"
);
});
}
else
if
(
$scope
.
tableViewOperType
==
TABLE_VIEW_OPER_TYPE
.
UPDATE
)
{
if
(
!
$scope
.
item
.
comment
)
{
$scope
.
item
.
comment
=
""
;
}
ConfigService
.
update_item
(
$rootScope
.
pageContext
.
appId
,
cluster
.
env
,
cluster
.
name
,
toOperationNamespace
.
baseInfo
.
namespaceName
,
$scope
.
item
).
then
(
function
(
result
)
{
toastr
.
success
(
"
更新成功, 如需生效请发布
"
);
itemModal
.
modal
(
'
hide
'
);
$rootScope
.
refreshNamespaces
(
namespace_view_type
.
TABLE
);
},
function
(
result
)
{
toastr
.
error
(
AppUtil
.
errorMsg
(
result
),
"
更新失败
"
);
});
}
});
$scope
.
addItemBtnDisabled
=
false
;
itemModal
.
modal
(
'
hide
'
);
$rootScope
.
refreshNamespaces
(
namespace_view_type
.
TABLE
);
}
else
{
if
(
!
$scope
.
item
.
comment
)
{
$scope
.
item
.
comment
=
""
;
}
ConfigService
.
update_item
(
$rootScope
.
pageContext
.
appId
,
$rootScope
.
pageContext
.
env
,
$rootScope
.
pageContext
.
clusterName
,
toOperationNamespace
.
baseInfo
.
namespaceName
,
$scope
.
item
).
then
(
function
(
result
)
{
toastr
.
success
(
"
更新成功, 如需生效请发布
"
);
itemModal
.
modal
(
'
hide
'
);
$rootScope
.
refreshNamespaces
(
namespace_view_type
.
TABLE
);
},
function
(
result
)
{
toastr
.
error
(
AppUtil
.
errorMsg
(
result
),
"
更新失败
"
);
});
}
}
...
...
@@ -362,30 +362,32 @@ application_module.controller("ConfigNamespaceController",
function
closeTip
(
clusterName
)
{
var
hideTip
=
JSON
.
parse
(
localStorage
.
getItem
(
"
hideTip
"
));
if
(
!
hideTip
){
if
(
!
hideTip
)
{
hideTip
=
{};
hideTip
[
$rootScope
.
pageContext
.
appId
]
=
{};
}
if
(
!
hideTip
[
$rootScope
.
pageContext
.
appId
]){
if
(
!
hideTip
[
$rootScope
.
pageContext
.
appId
])
{
hideTip
[
$rootScope
.
pageContext
.
appId
]
=
{};
}
hideTip
[
$rootScope
.
pageContext
.
appId
][
clusterName
]
=
true
;
$rootScope
.
hideTip
=
hideTip
;
localStorage
.
setItem
(
"
hideTip
"
,
JSON
.
stringify
(
hideTip
));
}
function
showText
(
text
)
{
$scope
.
text
=
text
;
$
(
'
#showText
'
).
modal
(
'
show
'
);
}
$
(
'
.config-item-container
'
).
removeClass
(
'
hide
'
);
new
Clipboard
(
'
.clipboard
'
);
}]);
}
]);
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录