Skip to content

apollo
apollo

superrain51 / apollo
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
apollo
apollo

体验新版 GitCode，发现更多精彩内容 >>

提交 c4967e8d 编写于 作者: J Jason Song 提交者： GitHub
浏览文件
操作

Merge pull request #415 from lepdou/bugfix_0920 

bugfix: update other cluster's item
上级 15e41ed3 9936e2f2
隐藏空白更改
内联 并排
Showing with 80 addition and 78 deletion
apollo-portal/src/main/resources/static/scripts/controller/config/ConfigNamespaceController.js
浏览文件 @ c4967e8d
...@@ -24,7 +24,7 @@ application_module.controller("ConfigNamespaceController", ...@@ -24,7 +24,7 @@ application_module.controller("ConfigNamespaceController",
$scope.prepareReleaseNamespace = prepareReleaseNamespace; $scope.prepareReleaseNamespace = prepareReleaseNamespace;
$scope.release = release; $scope.release = release;
$scope.switchReleaseChangeViewType = switchReleaseChangeViewType; $scope.switchReleaseChangeViewType = switchReleaseChangeViewType;
$scope.showRollbackAlertDialog = showRollbackAlertDialog; $scope.showRollbackAlertDialog = showRollbackAlertDialog;
...@@ -38,22 +38,22 @@ application_module.controller("ConfigNamespaceController", ...@@ -38,22 +38,22 @@ application_module.controller("ConfigNamespaceController",
$scope.deleteItem = deleteItem; $scope.deleteItem = deleteItem;
$scope.editItem = editItem; $scope.editItem = editItem;
$scope.createItem = createItem; $scope.createItem = createItem;
$scope.doItem = doItem; $scope.doItem = doItem;
$scope.closeTip = closeTip; $scope.closeTip = closeTip;
$scope.showText = showText; $scope.showText = showText;
$scope.releaseBtnDisabled = false; $scope.releaseBtnDisabled = false;
$scope.rollbackBtnDisabled = false; $scope.rollbackBtnDisabled = false;
$scope.addItemBtnDisabled = false; $scope.addItemBtnDisabled = false;
$scope.commitChangeBtnDisabled = false; $scope.commitChangeBtnDisabled = false;
init(); init();
function init() { function init() {
PermissionService.get_app_role_users($rootScope.pageContext.appId) PermissionService.get_app_role_users($rootScope.pageContext.appId)
.then(function (result) { .then(function (result) {
...@@ -69,10 +69,8 @@ application_module.controller("ConfigNamespaceController", ...@@ -69,10 +69,8 @@ application_module.controller("ConfigNamespaceController",
UserService.load_user().then(function (result) { UserService.load_user().then(function (result) {
$scope.currentUser = result.userId; $scope.currentUser = result.userId;
}); });
}
}
function refreshNamespaces(viewType) { function refreshNamespaces(viewType) {
if ($rootScope.pageContext.env == '') { if ($rootScope.pageContext.env == '') {
...@@ -85,7 +83,7 @@ application_module.controller("ConfigNamespaceController", ...@@ -85,7 +83,7 @@ application_module.controller("ConfigNamespaceController",
function (result) { function (result) {
$scope.namespaces = result; $scope.namespaces = result;
}, function (result) { }, function (result) {
toastr.error(AppUtil.errorMsg(result), "加载配置信息出错"); toastr.error(AppUtil.errorMsg(result), "加载配置信息出错");
}); });
...@@ -162,7 +160,7 @@ application_module.controller("ConfigNamespaceController", ...@@ -162,7 +160,7 @@ application_module.controller("ConfigNamespaceController",
} }
); );
} }
$scope.releaseChangeViewType = 'change'; $scope.releaseChangeViewType = 'change';
function switchReleaseChangeViewType(type) { function switchReleaseChangeViewType(type) {
$scope.releaseChangeViewType = type; $scope.releaseChangeViewType = type;
...@@ -173,7 +171,6 @@ application_module.controller("ConfigNamespaceController", ...@@ -173,7 +171,6 @@ application_module.controller("ConfigNamespaceController",
$("#rollbackAlertDialog").modal('show'); $("#rollbackAlertDialog").modal('show');
} }
$scope.toRollbackNamespace = {}; $scope.toRollbackNamespace = {};
function preRollback(namespace) { function preRollback(namespace) {
$scope.toRollbackNamespace = namespace; $scope.toRollbackNamespace = namespace;
...@@ -181,7 +178,8 @@ application_module.controller("ConfigNamespaceController", ...@@ -181,7 +178,8 @@ application_module.controller("ConfigNamespaceController",
ReleaseService.findActiveReleases($rootScope.pageContext.appId, ReleaseService.findActiveReleases($rootScope.pageContext.appId,
$rootScope.pageContext.env, $rootScope.pageContext.env,
$rootScope.pageContext.clusterName, $rootScope.pageContext.clusterName,
$scope.toRollbackNamespace.baseInfo.namespaceName, 0, 2) $scope.toRollbackNamespace.baseInfo.namespaceName,
0, 2)
.then(function (result) { .then(function (result) {
if (result.length <= 1) { if (result.length <= 1) {
toastr.error("没有可以回滚的发布历史"); toastr.error("没有可以回滚的发布历史");
...@@ -208,8 +206,8 @@ application_module.controller("ConfigNamespaceController", ...@@ -208,8 +206,8 @@ application_module.controller("ConfigNamespaceController",
function rollback() { function rollback() {
$scope.rollbackBtnDisabled = true; $scope.rollbackBtnDisabled = true;
ReleaseService.rollback( ReleaseService.rollback(
$rootScope.pageContext.env, $rootScope.pageContext.env,
$scope.firstRelease.id) $scope.firstRelease.id)
.then(function (result) { .then(function (result) {
toastr.success("回滚成功"); toastr.success("回滚成功");
$scope.rollbackBtnDisabled = false; $scope.rollbackBtnDisabled = false;
...@@ -262,7 +260,7 @@ application_module.controller("ConfigNamespaceController", ...@@ -262,7 +260,7 @@ application_module.controller("ConfigNamespaceController",
$("#itemModal").modal("show"); $("#itemModal").modal("show");
} }
//新增配置 //新增配置
function createItem(namespace) { function createItem(namespace) {
if (!lockCheck(namespace)) { if (!lockCheck(namespace)) {
...@@ -290,63 +288,65 @@ application_module.controller("ConfigNamespaceController", ...@@ -290,63 +288,65 @@ application_module.controller("ConfigNamespaceController",
if (selectedClusters.length == 0) { if (selectedClusters.length == 0) {
toastr.error("请选择集群"); toastr.error("请选择集群");
} else { return;
if (!$scope.item.value) { }
$scope.item.value = "";
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) { selectedClusters.forEach(function (cluster) {
if ($scope.tableViewOperType == TABLE_VIEW_OPER_TYPE.CREATE) { ConfigService.create_item($rootScope.pageContext.appId,
cluster.env,
//check key unique cluster.name,
var hasRepeatKey = false; toOperationNamespace.baseInfo.namespaceName,
toOperationNamespace.items.forEach(function (item) { $scope.item).then(
if (!item.isDeleted && $scope.item.key == item.item.key) { function (result) {
toastr.error("key=" + $scope.item.key + " 已存在"); toastr.success(cluster.env + " , " + $scope.item.key, "添加成功");
hasRepeatKey = true; }, function (result) {
return; 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", ...@@ -362,30 +362,32 @@ application_module.controller("ConfigNamespaceController",
function closeTip(clusterName) { function closeTip(clusterName) {
var hideTip = JSON.parse(localStorage.getItem("hideTip")); var hideTip = JSON.parse(localStorage.getItem("hideTip"));
if (!hideTip){ if (!hideTip) {
hideTip = {}; hideTip = {};
hideTip[$rootScope.pageContext.appId] = {}; hideTip[$rootScope.pageContext.appId] = {};
} }
if (!hideTip[$rootScope.pageContext.appId]){ if (!hideTip[$rootScope.pageContext.appId]) {
hideTip[$rootScope.pageContext.appId] = {}; hideTip[$rootScope.pageContext.appId] = {};
} }
hideTip[$rootScope.pageContext.appId][clusterName] = true; hideTip[$rootScope.pageContext.appId][clusterName] = true;
$rootScope.hideTip = hideTip; $rootScope.hideTip = hideTip;
localStorage.setItem("hideTip", JSON.stringify(hideTip)); localStorage.setItem("hideTip", JSON.stringify(hideTip));
} }
function showText(text) { function showText(text) {
$scope.text = text; $scope.text = text;
$('#showText').modal('show'); $('#showText').modal('show');
} }
$('.config-item-container').removeClass('hide'); $('.config-item-container').removeClass('hide');
new Clipboard('.clipboard'); new Clipboard('.clipboard');
}]); }
]);
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或