Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
apollo
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
apollo
Commits
dddd4fac
Commit
dddd4fac
authored
Dec 02, 2018
by
nobodyiam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add missing env and namespace alert
parent
e600f5b8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
apollo-portal/src/main/resources/static/scripts/controller/config/ConfigBaseInfoController.js
...tic/scripts/controller/config/ConfigBaseInfoController.js
+7
-0
apollo-portal/src/main/resources/static/views/component/delete-namespace-modal.html
...ources/static/views/component/delete-namespace-modal.html
+1
-1
No files found.
apollo-portal/src/main/resources/static/scripts/controller/config/ConfigBaseInfoController.js
View file @
dddd4fac
...
@@ -105,6 +105,10 @@ function ConfigBaseInfoController($rootScope, $scope, $window, $location, toastr
...
@@ -105,6 +105,10 @@ function ConfigBaseInfoController($rootScope, $scope, $window, $location, toastr
AppService
.
find_miss_envs
(
$rootScope
.
pageContext
.
appId
).
then
(
function
(
result
)
{
AppService
.
find_miss_envs
(
$rootScope
.
pageContext
.
appId
).
then
(
function
(
result
)
{
$scope
.
missEnvs
=
AppUtil
.
collectData
(
result
);
$scope
.
missEnvs
=
AppUtil
.
collectData
(
result
);
if
(
$scope
.
missEnvs
.
length
>
0
)
{
toastr
.
warning
(
"
当前项目有环境缺失,请点击页面左侧『补缺环境』补齐数据
"
);
}
$scope
.
findMissingNamespaces
();
$scope
.
findMissingNamespaces
();
});
});
}
}
...
@@ -120,6 +124,9 @@ function ConfigBaseInfoController($rootScope, $scope, $window, $location, toastr
...
@@ -120,6 +124,9 @@ function ConfigBaseInfoController($rootScope, $scope, $window, $location, toastr
AppService
.
find_missing_namespaces
(
$rootScope
.
pageContext
.
appId
,
$rootScope
.
pageContext
.
env
,
AppService
.
find_missing_namespaces
(
$rootScope
.
pageContext
.
appId
,
$rootScope
.
pageContext
.
env
,
$rootScope
.
pageContext
.
clusterName
).
then
(
function
(
result
)
{
$rootScope
.
pageContext
.
clusterName
).
then
(
function
(
result
)
{
$scope
.
missingNamespaces
=
AppUtil
.
collectData
(
result
);
$scope
.
missingNamespaces
=
AppUtil
.
collectData
(
result
);
if
(
$scope
.
missingNamespaces
.
length
>
0
)
{
toastr
.
warning
(
"
当前环境有Namespace缺失,请点击页面左侧『补缺Namespace』补齐数据
"
);
}
});
});
}
}
};
};
...
...
apollo-portal/src/main/resources/static/views/component/delete-namespace-modal.html
View file @
dddd4fac
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
删除Namespace将导致实例获取不到此Namespace的配置,确定要删除吗?
删除Namespace将导致实例获取不到此Namespace的配置,确定要删除吗?
</div>
</div>
<div
class=
"modal-body form-horizontal"
ng-show=
"!toDeleteNamespace.isPublic"
>
<div
class=
"modal-body form-horizontal"
ng-show=
"!toDeleteNamespace.isPublic"
>
删除私有Namespace将导致实例获取不到此Namespace的配置,
而且无法在当前集群重新创建该Namespace(除非使用管理员工具把所有环境的AppNamespace删除后重建
),确定要删除吗?
删除私有Namespace将导致实例获取不到此Namespace的配置,
且页面会提示缺失Namespace(除非使用管理员工具删除AppNamespace
),确定要删除吗?
</div>
</div>
<div
class=
"modal-footer"
>
<div
class=
"modal-footer"
>
<button
type=
"button"
class=
"btn btn-default"
data-dismiss=
"modal"
>
<button
type=
"button"
class=
"btn btn-default"
data-dismiss=
"modal"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment