From 25e54fae82bc69f01f49411196c97d4a44bb0f50 Mon Sep 17 00:00:00 2001
From: Westly Wright <westly.wright@gmail.com>
Date: Thu, 21 Mar 2019 15:56:50 -0700
Subject: [PATCH] gdns providers - allow read only + owner when adding members

rancher/rancher#18938
---
 .../addon/global-dns/entries/new/template.hbs |  2 +-
 .../global-dns/providers/new/template.hbs     |  2 +-
 .../form-members-global-access/component.js   | 13 ++++---
 .../form-members-global-access/template.hbs   | 34 ++++++++-----------
 4 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/lib/global-admin/addon/global-dns/entries/new/template.hbs b/lib/global-admin/addon/global-dns/entries/new/template.hbs
index b91e2ca6e..4965cb5af 100644
--- a/lib/global-admin/addon/global-dns/entries/new/template.hbs
+++ b/lib/global-admin/addon/global-dns/entries/new/template.hbs
@@ -187,7 +187,7 @@
        expand=(action expandFn)
     }}
       {{form-members-global-access
-        ownerOnly=true
+        excludeMember=true
         readOnly=false
         resource=model.globaldns
         addAuthorizedPrincipal=(action "addAuthorizedPrincipal")
diff --git a/lib/global-admin/addon/global-dns/providers/new/template.hbs b/lib/global-admin/addon/global-dns/providers/new/template.hbs
index d9c767fc9..2b3db9c79 100644
--- a/lib/global-admin/addon/global-dns/providers/new/template.hbs
+++ b/lib/global-admin/addon/global-dns/providers/new/template.hbs
@@ -54,7 +54,7 @@
      expand=(action expandFn)
   }}
     {{form-members-global-access
-      ownerOnly=true
+      excludeMember=true
       readOnly=false
       resource=model
       addAuthorizedPrincipal=(action "addAuthorizedPrincipal")
diff --git a/lib/shared/addon/components/form-members-global-access/component.js b/lib/shared/addon/components/form-members-global-access/component.js
index 42d2ce5c5..80fb7389f 100644
--- a/lib/shared/addon/components/form-members-global-access/component.js
+++ b/lib/shared/addon/components/form-members-global-access/component.js
@@ -29,7 +29,7 @@ export default Component.extend({
   membersHeaders:         MEMBERS_HEADERS,
   sortBy:                 '',
   descending:             false,
-  ownerOnly:              false,
+  excludeMember:              false,
   resource:               null,
   gotError:               null,
   removeMember:           null,
@@ -38,9 +38,7 @@ export default Component.extend({
   init() {
     this._super(...arguments);
 
-    if (!this.ownerOnly) {
-      this.initOptionsForMembersAccessType();
-    }
+    this.initOptionsForMembersAccessType();
   },
 
   actions: {
@@ -71,7 +69,12 @@ export default Component.extend({
   },
 
   initOptionsForMembersAccessType() {
-    set(this, 'optionsForAccessType', this.globalStore.getById('schema', 'member').optionsFor('accessType') || []);
+    let accessTypes = this.globalStore.getById('schema', 'member').optionsFor('accessType') || [];
+
+    if (this.excludeMember) {
+      accessTypes = accessTypes.without('member');
+    }
+    set(this, 'optionsForAccessType', accessTypes);
 
     return;
   },
diff --git a/lib/shared/addon/components/form-members-global-access/template.hbs b/lib/shared/addon/components/form-members-global-access/template.hbs
index 235c3a8d5..657787904 100644
--- a/lib/shared/addon/components/form-members-global-access/template.hbs
+++ b/lib/shared/addon/components/form-members-global-access/template.hbs
@@ -30,25 +30,21 @@
             {{member.displayType}}
           </td>
           <td data-title="{{dt.accessType}}:">
-            {{#if ownerOnly}}
-              {{member.accessType}}
-            {{else}}
-              <select
-                class="form-control"
-                onchange={{action (mut member.accessType) value="target.value"}}
-              >
-                {{#unless (eq member.accessType "")}}
-                  <option value="" selected=true>
-                    {{t "formMembersGlobalAccess.table.prompt"}}
-                  </option>
-                {{/unless}}
-                {{#each optionsForAccessType as |choice|}}
-                  <option value="{{choice}}" selected={{eq choice member.accessType}}>
-                    {{choice}}
-                  </option>
-                {{/each}}
-              </select>
-            {{/if}}
+            <select
+              class="form-control"
+              onchange={{action (mut member.accessType) value="target.value"}}
+            >
+              {{#unless (eq member.accessType "")}}
+                <option value="" selected=true>
+                  {{t "formMembersGlobalAccess.table.prompt"}}
+                </option>
+              {{/unless}}
+              {{#each optionsForAccessType as |choice|}}
+                <option value="{{choice}}" selected={{eq choice member.accessType}}>
+                  {{choice}}
+                </option>
+              {{/each}}
+            </select>
           </td>
           <td data-title="{{t "generic.actions"}}:" class="actions">
             <div class="p-5">