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
96441c0d
Unverified
Commit
96441c0d
authored
Jan 23, 2019
by
张乐
Committed by
GitHub
Jan 23, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1898 from kezhenxu94/enhancement/delete-config-item
prompt current config item that is being deleted
parents
11f6234d
1e467a7c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
apollo-portal/src/main/resources/static/config.html
apollo-portal/src/main/resources/static/config.html
+1
-1
apollo-portal/src/main/resources/static/scripts/controller/config/ConfigNamespaceController.js
...ic/scripts/controller/config/ConfigNamespaceController.js
+3
-2
apollo-portal/src/main/resources/static/views/component/namespace-panel-branch-tab.html
...es/static/views/component/namespace-panel-branch-tab.html
+1
-1
apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html
...es/static/views/component/namespace-panel-master-tab.html
+2
-2
No files found.
apollo-portal/src/main/resources/static/config.html
View file @
96441c0d
...
...
@@ -257,7 +257,7 @@
<deletenamespacemodal
env=
"pageContext.env"
></deletenamespacemodal>
<apolloconfirmdialog
apollo-dialog-id=
"'deleteConfirmDialog'"
apollo-title=
"'删除配置'"
apollo-detail=
"'确定要删除配置吗?'"
apollo-detail=
"'
您正在删除 Key 为 <b>' + config.key + '</b> Value 为 <b>' + config.value + '</b> 的配置.<br>
确定要删除配置吗?'"
apollo-show-cancel-btn=
"true"
apollo-confirm=
"deleteItem"
></apolloconfirmdialog>
<apolloconfirmdialog
apollo-dialog-id=
"'releaseNoPermissionDialog'"
apollo-title=
"'发布'"
...
...
apollo-portal/src/main/resources/static/scripts/controller/config/ConfigNamespaceController.js
View file @
96441c0d
...
...
@@ -151,13 +151,14 @@ function controller($rootScope, $scope, toastr, AppUtil, EventManager, ConfigSer
var
toDeleteItemId
=
0
;
function
preDeleteItem
(
namespace
,
item
Id
)
{
function
preDeleteItem
(
namespace
,
item
)
{
if
(
!
lockCheck
(
namespace
))
{
return
;
}
$scope
.
config
=
item
;
$scope
.
toOperationNamespace
=
namespace
;
toDeleteItemId
=
item
I
d
;
toDeleteItemId
=
item
.
i
d
;
$
(
"
#deleteConfirmDialog
"
).
modal
(
"
show
"
);
}
...
...
apollo-portal/src/main/resources/static/views/component/namespace-panel-branch-tab.html
View file @
96441c0d
...
...
@@ -189,7 +189,7 @@
<img
style=
"margin-left: 5px;"
src=
"img/cancel.png"
data-tooltip=
"tooltip"
data-placement=
"bottom"
title=
"删除"
ng-if=
"!config.isDeleted"
ng-click=
"preDeleteItem(namespace.branch, config.item
.id
)"
ng-click=
"preDeleteItem(namespace.branch, config.item)"
ng-show=
"namespace.hasModifyPermission"
>
</td>
...
...
apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html
View file @
96441c0d
...
...
@@ -294,7 +294,7 @@
ng-show=
"namespace.hasModifyPermission"
>
<img
style=
"margin-left: 5px;"
src=
"img/cancel.png"
data-tooltip=
"tooltip"
data-placement=
"bottom"
title=
"删除"
ng-click=
"preDeleteItem(namespace, config.item
.id
)"
ng-click=
"preDeleteItem(namespace, config.item)"
ng-show=
"namespace.hasModifyPermission"
>
</td>
<td
width=
"6%"
class=
"text-center"
ng-if=
"config.isDeleted"
>
...
...
@@ -403,7 +403,7 @@
ng-show=
"namespace.hasModifyPermission"
>
<img
style=
"margin-left: 5px;"
src=
"img/cancel.png"
data-tooltip=
"tooltip"
data-placement=
"bottom"
title=
"删除"
ng-click=
"preDeleteItem(namespace, config.item
.id
)"
ng-click=
"preDeleteItem(namespace, config.item)"
ng-show=
"namespace.hasModifyPermission"
>
</td>
<td
width=
"6%"
class=
"text-center"
ng-if=
"config.isDeleted"
>
...
...
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