Skip to content

Commit b02bc9a

Browse files
xingzhang-suserushk014
authored andcommitted
NVSHAS-4673: suggest to add message before exporting the group
1 parent 05a5c87 commit b02bc9a

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

admin/webapp/websrc/app/routes/components/export-options/export-options.component.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<div class="mx-3 mt-3" [formGroup]="exportOptionsForm">
22
<div class="clearfix margin-top-m" *ngIf="source === 'group'">
3+
<div class="text-muted text-small mb-2">
4+
<em class="eos-icons icon-18 text-info mr-2">info</em
5+
>{{ 'group.export.INFO' | translate }}
6+
</div>
37
<label class="pull-left text-bold margin-right-m">{{
48
'group.POLICY_MODE' | translate
59
}}</label>

admin/webapp/websrc/app/routes/registries/registries.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ export class RegistriesComponent implements OnInit, OnDestroy {
8686
name:
8787
GlobalVariable.isMaster && !GlobalVariable.isRemote
8888
? '_repo_scan'
89-
: GlobalVariable.isMaster && GlobalVariable.isRemote || GlobalVariable.isMember
89+
: (GlobalVariable.isMaster && GlobalVariable.isRemote) ||
90+
GlobalVariable.isMember
9091
? 'fed._repo_scan'
9192
: '',
9293
isAllView: false,

admin/webapp/websrc/assets/i18n/en-common.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2265,7 +2265,8 @@
22652265
},
22662266
"export": {
22672267
"TITLE": "Export Group Policy",
2268-
"EXPORT": "Export"
2268+
"EXPORT": "Export",
2269+
"INFO": "In addition to the selected group(s), all 'linked' groups will also be exported. A linked group is any other group that a selected group will connect to or from as allowed by a network rule."
22692270
},
22702271
"script": {
22712272
"TITLE": "Custom Check",

admin/webapp/websrc/assets/i18n/zh_cn-common.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2265,7 +2265,8 @@
22652265
},
22662266
"export": {
22672267
"TITLE": "导出组策略",
2268-
"EXPORT": "导出"
2268+
"EXPORT": "导出",
2269+
"INFO": "除了所选的群组外,所有“关联”群组也将被导出。“关联”群组是指根据网络规则,任何与所选群组存在连接关系(无论是连接到还是被连接)的其他群组。"
22692270
},
22702271
"script": {
22712272
"TITLE": "自定义检查",

0 commit comments

Comments
 (0)