Fix admin accounts in user management (fixes #354)

gramps-project · Jan 15, 2024 · 469e1e4 · 469e1e4
1 parent 02b3ecd
commit 469e1e4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/components/GrampsjsFormUser.js b/src/components/GrampsjsFormUser.js
@@ -19,6 +19,7 @@ export const userRoles = {
  2: 'Contributor',
  3: 'Editor',
  4: 'Owner',
+ 5: 'Administrator',
 }
 
 class GrampsjsFormUser extends GrampsjsTranslateMixin(LitElement) {
@@ -44,6 +45,7 @@ class GrampsjsFormUser extends GrampsjsTranslateMixin(LitElement) {
  static get properties() {
  return {
  data: {type: Object},
+ ismulti: {type: Boolean},
  isFormValid: {type: Boolean},
  newUser: {type: Boolean},
  }
@@ -52,6 +54,7 @@ class GrampsjsFormUser extends GrampsjsTranslateMixin(LitElement) {
  constructor() {
  super()
  this.data = {}
+ this.ismulti = false
  this.isFormValid = false
  this.newUser = false
  }
@@ -115,6 +118,7 @@ class GrampsjsFormUser extends GrampsjsTranslateMixin(LitElement) {
  ${Object.keys(userRoles)
  .map(Number)
  .sort((a, b) => a - b)
+ .filter(x => x <= 4 || this.ismulti)
  .map(
  role => html`
  <mwc-list-item

diff --git a/src/lang/en.json b/src/lang/en.json
@@ -134,5 +134,6 @@
  "Largest Segment": "Largest Segment",
  "Bookmark this": "Bookmark this",
  "Remove bookmark": "Remove bookmark",
- "Ancestor frequency": "Ancestor frequency"
+ "Ancestor frequency": "Ancestor frequency",
+ "Administrator": "Administrator"
 }
diff --git a/src/views/GrampsjsViewSettings.js b/src/views/GrampsjsViewSettings.js
@@ -161,6 +161,7 @@ export class GrampsjsViewSettings extends GrampsjsViewSettingsOnboarding {
  <grampsjs-users
  .strings="${this.strings}"
  .data="${this.userData}"
+ ?ismulti="${!!this.dbInfo?.server?.multi_tree}"
  @user:updated="${this._handleUserChanged}"
  @user:added="${this._handleUserAdded}"
  @user:added-multiple="${this._handleUsersAdded}"