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
c9089e4c
Commit
c9089e4c
authored
Oct 19, 2019
by
Jason Song
Committed by
kezhenxu94
Oct 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor fix i18n translations (#2675)
parent
73cf7fef
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ItemController.java
...ip/framework/apollo/portal/controller/ItemController.java
+2
-2
apollo-portal/src/main/resources/static/config/sync.html
apollo-portal/src/main/resources/static/config/sync.html
+1
-2
No files found.
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ItemController.java
View file @
c9089e4c
...
@@ -164,7 +164,7 @@ public class ItemController {
...
@@ -164,7 +164,7 @@ public class ItemController {
if
(
permissionValidator
if
(
permissionValidator
.
shouldHideConfigToCurrentUser
(
namespace
.
getAppId
(),
namespace
.
getEnv
().
name
(),
namespace
.
getNamespaceName
()))
{
.
shouldHideConfigToCurrentUser
(
namespace
.
getAppId
(),
namespace
.
getEnv
().
name
(),
namespace
.
getNamespaceName
()))
{
diff
.
setDiffs
(
new
ItemChangeSets
());
diff
.
setDiffs
(
new
ItemChangeSets
());
diff
.
setExtInfo
(
"
您不是该项目的管理员,也没有该Namespace在 "
+
namespace
.
getEnv
()
+
" 环境的编辑或发布权限"
);
diff
.
setExtInfo
(
"
You are not this project's administrator, nor you have edit or release permission for the namespace in environment: "
+
namespace
.
getEnv
()
);
}
}
}
}
...
@@ -195,7 +195,7 @@ public class ItemController {
...
@@ -195,7 +195,7 @@ public class ItemController {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
build
();
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
build
();
}
}
else
else
throw
new
AccessDeniedException
(
String
.
format
(
"
您没有修改环境%s的权限
"
,
envNoPermission
));
throw
new
AccessDeniedException
(
String
.
format
(
"
You don't have the permission to modify environment: %s
"
,
envNoPermission
));
}
}
@PreAuthorize
(
value
=
"@permissionValidator.hasModifyNamespacePermission(#appId, #namespaceName, #env)"
)
@PreAuthorize
(
value
=
"@permissionValidator.hasModifyNamespacePermission(#appId, #namespaceName, #env)"
)
...
...
apollo-portal/src/main/resources/static/config/sync.html
View file @
c9089e4c
...
@@ -149,8 +149,7 @@
...
@@ -149,8 +149,7 @@
ng-show=
"clusterDiff.diffs.createItems.length + clusterDiff.diffs.updateItems.length == 0 || clusterDiff.extInfo"
>
ng-show=
"clusterDiff.diffs.createItems.length + clusterDiff.diffs.updateItems.length == 0 || clusterDiff.extInfo"
>
<span
<span
ng-show=
"clusterDiff.diffs.createItems.length + clusterDiff.diffs.updateItems.length == 0 && !clusterDiff.extInfo"
>
{{'Config.Sync.NoNeedSyncItem' | translate }}
</span>
ng-show=
"clusterDiff.diffs.createItems.length + clusterDiff.diffs.updateItems.length == 0 && !clusterDiff.extInfo"
>
{{'Config.Sync.NoNeedSyncItem' | translate }}
</span>
<span
ng-show=
"clusterDiff.extInfo"
ng-bind=
"clusterDiff.extInfo"
></span>
<span
ng-show=
"clusterDiff.extInfo"
ng-bind=
"clusterDiff.extInfo"
></span>
, {{'Config.Sync.IgnoreSync' | translate }}
,{{'Config.Sync.IgnoreSync' | translate }}
</div>
</div>
<div
class=
"row"
style=
"margin-top: 10px;"
<div
class=
"row"
style=
"margin-top: 10px;"
...
...
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