Skip to content

Commit fec8f96

Browse files
smayo-gplssandbergja
authored andcommitted
lp2075372: Admin Page Permission Wording
Added a new option to basic-admin-page-component to give a page a title different from the record label. Then made the perm_list page use the title 'Permission List' and record label 'Permission' as the singular for everything else. Release-note: Remove incorrect words from permissions administration screen. Signed-off-by: Steven Mayo <[email protected]> Signed-off-by: Jane Sandberg <[email protected]>
1 parent 291ed92 commit fec8f96

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import {Observable, tap, switchMap} from 'rxjs';
1010
@Component({
1111
template: `
1212
<ng-container *ngIf="idlClass">
13-
<eg-title i18n-prefix prefix="{{recordLabel || classLabel}} Administration">
13+
<eg-title i18n-prefix prefix="{{ recordTitle || recordLabel || classLabel}} Administration">
1414
</eg-title>
15-
<eg-staff-banner bannerText="{{recordLabel || classLabel}}" i18n-bannerText>
15+
<eg-staff-banner bannerText="{{ recordTitle || recordLabel || classLabel}}" i18n-bannerText>
1616
</eg-staff-banner>
1717
<eg-admin-page persistKeyPfx="{{persistKeyPfx}}" idlClass="{{idlClass}}"
1818
configLinkBasePath="{{configLinkBasePath}}"
@@ -45,6 +45,8 @@ export class BasicAdminPageComponent implements OnInit {
4545
contextOrgSelectorPersistKey = '';
4646
readonlyFields = '';
4747
recordLabel = '';
48+
// Overrides the record label, but only for the page title
49+
recordTitle = '';
4850
orgDefaultAllowed = '';
4951
orgFieldsDefaultingToContextOrg = '';
5052
hideClearFilters: boolean;
@@ -105,6 +107,7 @@ export class BasicAdminPageComponent implements OnInit {
105107
this.contextOrgSelectorPersistKey = data['contextOrgSelectorPersistKey'];
106108
this.readonlyFields = data['readonlyFields'];
107109
this.recordLabel = data['recordLabel'];
110+
this.recordTitle = data['recordTitle'];
108111
this.orgDefaultAllowed = data['orgDefaultAllowed'];
109112
this.orgFieldsDefaultingToContextOrg = data['orgFieldsDefaultingToContextOrg'];
110113
this.hideClearFilters = data['hideClearFilters'];

Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,15 @@ const routes: Routes = [{
8787
}, {
8888
path: 'permission/grp_tree',
8989
component: PermGroupTreeComponent
90+
}, {
91+
path: 'permission/perm_list',
92+
component: BasicAdminPageComponent,
93+
data: [{
94+
schema: 'permission',
95+
table: 'perm_list',
96+
recordTitle: 'Permission List',
97+
recordLabel: 'Permission'
98+
}]
9099
}, {
91100
path: 'actor/org_unit',
92101
loadChildren: () =>

0 commit comments

Comments
 (0)