fix: don't fetch ACLs when user doesn't exist yet (projectcaluma#385)

velrest · Jan 26, 2022 · b407b5e · b407b5e
1 parent 3884c5e
commit b407b5e
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 32 deletions.
diff --git a/addon/templates/users/edit.hbs b/addon/templates/users/edit.hbs
@@ -178,40 +178,50 @@
               {{t "emeis.acl-table.headings.scope"}}
             </th>
             <th class="uk-table-shrink uk-text-nowrap">
-              <UkButton
-                data-test-add-acl
-                @color="primary"
-                {{on "click" (fn (set this.showAclWizzard true))}}
-              >
-                {{t "emeis.acl-table.headings.add-entry"}}
-              </UkButton>
+              {{#unless @model.isNew}}
+                <UkButton
+                  data-test-add-acl
+                  @color="primary"
+                  {{on "click" (fn (set this.showAclWizzard true))}}
+                >
+                  {{t "emeis.acl-table.headings.add-entry"}}
+                </UkButton>
+              {{/unless}}
             </th>
           </table.head>
-          <table.body as |body|>
-            <body.row>
-              {{#let body.model as |aclEntry|}}
-                <td data-test-acl-role={{aclEntry.id}}>
-                  {{aclEntry.role.name}}
-                </td>
+          {{#if @model.isNew}}
+            <tbody>
+              <tr>
+                <td colspan="99" class="uk-text-center">You can add ACLs once the new user has been saved.</td>
+              </tr>
+            </tbody>
+          {{else}}
+            <table.body as |body|>
+              <body.row>
+                {{#let body.model as |aclEntry|}}
+                  <td data-test-acl-role={{aclEntry.id}}>
+                    {{aclEntry.role.name}}
+                  </td>
 
-                <td data-test-acl-scope={{aclEntry.id}}>
-                  {{aclEntry.scope.name}}
-                </td>
+                  <td data-test-acl-scope={{aclEntry.id}}>
+                    {{aclEntry.scope.name}}
+                  </td>
 
-                <td data-test-acl-delete={{aclEntry.id}}>
-                  <span class="uk-flex uk-flex-center">
-                    <button
-                      type="button"
-                      class="uk-icon-button uk-margin-small-right"
-                      uk-icon="trash"
-                      tooltip="hey there"
-                      {{on "click" (perform this.deleteAclEntry aclEntry table.refresh)}}
-                    ></button>
-                  </span>
-                </td>
-              {{/let}}
-            </body.row>
-          </table.body>
+                  <td data-test-acl-delete={{aclEntry.id}}>
+                    <span class="uk-flex uk-flex-center">
+                      <button
+                        type="button"
+                        class="uk-icon-button uk-margin-small-right"
+                        uk-icon="trash"
+                        tooltip="hey there"
+                        {{on "click" (perform this.deleteAclEntry aclEntry table.refresh)}}
+                      ></button>
+                    </span>
+                  </td>
+                {{/let}}
+              </body.row>
+            </table.body>
+          {{/if}}
         </DataTable>
       {{/if}}
     </div>

diff --git a/translations/de.yaml b/translations/de.yaml
@@ -81,6 +81,7 @@ emeis:
       scope: "Berechtigungsbereich"
       role: "Rolle"
       add-entry: "Eintrag hinzufügen"
+    new-user-hint: "Berechtigungen können erst hinzugefügt werden, sobald der neue Benutzer gespeichert wurde."
 
   acl-wizzard:
     add-entry: "Berechtigung hinzufügen"
@@ -105,4 +106,4 @@ emeis:
           label-1: "Schinken"
           label-2: "Käse"
           label-3: "Zwiebeln"
-        meta-example-2: "Beispiel für benutzerdefiniertes Textfeld"
+        meta-example-2: "Beispiel für benutzerdefiniertes Textfeld"
diff --git a/translations/en.yaml b/translations/en.yaml
@@ -81,6 +81,7 @@ emeis:
       scope: "Scope"
       role: "Role"
       add-entry: "Add entry"
+    new-user-hint: "You can add ACLs once the new user has been saved."
 
   acl-wizzard:
     add-entry: "Add ACL Entry"
@@ -105,4 +106,4 @@ emeis:
           label-1: "Ham"
           label-2: "Cheese"
           label-3: "Onions"
-        meta-example-2: "Example for custom text field"
+        meta-example-2: "Example for custom text field"