diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions-editer/permissions-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions-editer/permissions-editer.component.html index a75ba11e7f23a396c4016df650545dc92dfedb5b..5e83cd089bf8b7b9d1de6dd4f9f0083f181bda1c 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions-editer/permissions-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions-editer/permissions-editer.component.html @@ -6,58 +6,74 @@ {{ 'mxk.apps.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
- + - + Id {{ 'mxk.apps.icon' | i18n }} {{ 'mxk.apps.name' | i18n }} - {{ 'mxk.apps.protocol' | i18n }} {{ 'mxk.apps.category' | i18n }} - + - {{ data.name }} - {{ data.protocol }} - {{ data.category }} + {{ data.name }} + +
{{ 'mxk.apps.category.none' | i18n }}
+
{{ 'mxk.apps.category.1011' | i18n }}
+
{{ 'mxk.apps.category.1012' | i18n }}
+
{{ 'mxk.apps.category.1013' | i18n }}
+
{{ 'mxk.apps.category.1014' | i18n }}
+
{{ 'mxk.apps.category.1015' | i18n }}
+
{{ 'mxk.apps.category.1016' | i18n }}
+
{{ 'mxk.apps.category.1017' | i18n }}
+
{{ 'mxk.apps.category.1111' | i18n }}
+
{{ 'mxk.apps.category.1112' | i18n }}
+
{{ 'mxk.apps.category.1113' | i18n }}
+
{{ 'mxk.apps.category.1114' | i18n }}
+
{{ 'mxk.apps.category.1211' | i18n }}
+
{{ 'mxk.apps.category.1212' | i18n }}
+
{{ 'mxk.apps.category.1213' | i18n }}
+
{{ 'mxk.apps.category.1214' | i18n }}
+
{{ 'mxk.apps.category.1215' | i18n }}
+
{{ 'mxk.apps.category.1311' | i18n }}
+
{{ 'mxk.apps.category.1411' | i18n }}
+
{{ 'mxk.apps.category.1511' | i18n }}
+
{{ 'mxk.apps.category.1512' | i18n }}
+
{{ 'mxk.apps.category.1611' | i18n }}
+
{{ 'mxk.apps.category.1711' | i18n }}
+
{{ 'mxk.apps.category.1712' | i18n }}
+
{{ 'mxk.apps.category.1811' | i18n }}
+
{{ 'mxk.apps.category.1812' | i18n }}
+
{{ 'mxk.apps.category.1911' | i18n }}
+
{{ 'mxk.apps.category.1912' | i18n }}
+
@@ -65,4 +81,4 @@
-
+ \ No newline at end of file diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.html index 264e2122d67d1157075773204ea8bfea523cbbf0..45de573d072133e3398887f0cf70c4b997cd67f4 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.html @@ -60,7 +60,6 @@ {{ 'mxk.roles.name' | i18n }} {{ 'mxk.apps.icon' | i18n }} {{ 'mxk.apps.name' | i18n }} - {{ 'mxk.apps.protocol' | i18n }} {{ 'mxk.apps.category' | i18n }} {{ 'mxk.text.action' | i18n }} @@ -72,7 +71,6 @@ {{ data.roleName }} {{ data.name }} - {{ data.protocol }}
{{ 'mxk.apps.category.none' | i18n }}
{{ 'mxk.apps.category.1011' | i18n }}
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/member-roles-editer/member-roles-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/member-roles-editer/member-roles-editer.component.html index af14e20b8ef8108341ee1dff5d62203c871a6469..de7cadabf69f456e9fd278a5a75d5739d8ad3a6f 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/member-roles-editer/member-roles-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/member-roles-editer/member-roles-editer.component.html @@ -4,10 +4,10 @@
- {{ 'mxk.groups.name' | i18n }} + {{ 'mxk.roles.name' | i18n }} - +
@@ -32,8 +32,8 @@ Id - {{ 'mxk.groups.name' | i18n }} - {{ 'mxk.groups.dynamic' | i18n }} + {{ 'mxk.roles.name' | i18n }} + {{ 'mxk.roles.dynamic' | i18n }} diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/member-roles-editer/member-roles-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/member-roles-editer/member-roles-editer.component.ts index 7553bcf51989b66cf9557878e8de4772ef84c8cc..7dd3b2b7ab849d2dbc64d9a2b71376fbe60c8b33 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/member-roles-editer/member-roles-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/member-roles-editer/member-roles-editer.component.ts @@ -35,7 +35,7 @@ export class MemberRolesEditerComponent implements OnInit { @Input() username?: String; query: { params: { - groupName: String; + roleName: String; username: String; protocol: String; startDate: String; @@ -58,7 +58,7 @@ export class MemberRolesEditerComponent implements OnInit { checked: boolean; } = { params: { - groupName: '', + roleName: '', username: '', protocol: '', startDate: '', diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/select-apps/select-apps.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/select-apps/select-apps.component.html index 479a966d1f0c800ed3843e2162f4c8f33c7641d8..078eddf20ca33086860e53bd64f189eda1b6ea1e 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/select-apps/select-apps.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/select-apps/select-apps.component.html @@ -34,7 +34,6 @@ Id {{ 'mxk.apps.icon' | i18n }} {{ 'mxk.apps.name' | i18n }} - {{ 'mxk.apps.protocol' | i18n }} {{ 'mxk.apps.category' | i18n }} @@ -48,7 +47,6 @@ {{ data.name }} - {{ data.protocol }}
{{ 'mxk.apps.category.none' | i18n }}
{{ 'mxk.apps.category.1011' | i18n }}
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/app-data.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/app-data.json index cdf800e593e0cc8432d699508e7367dc17efed62..656e65cda155c4904dc04967670a101334e94c76 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/app-data.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/app-data.json @@ -104,7 +104,7 @@ "icon": "anticon-setting", "children": [ { - "text": "机构管理", + "text": "机构配置", "i18n": "mxk.menu.config.institutions", "link": "/config/institutions", "icon": "anticon-appstore", diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json index e7ca9885e4c086832b48911d5d5a014b0a9a6707..88a5b0dded642cb0833f5290001a402cc544cc0b 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json @@ -41,7 +41,7 @@ "sessions": "会话管理", "config": { "": "配置管理", - "institutions": "机构管理", + "institutions": "机构配置", "accountsstrategys": "账号策略", "socialsproviders": "社交服务", "synchronizers": "同步器管理", diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json index e81b79e2c3183d37b9941fbc59ed2a4f4e8ce9a8..3f872c08176d9dff147b373c29ac05491eb809ce 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json @@ -42,7 +42,7 @@ "sessions": "會話管理", "config": { "": "配置管理", - "institutions": "機構管理", + "institutions": "機構配置", "accountsstrategys": "賬號策略", "socialsproviders": "社交服務", "synchronizers": "同步器管理",