diff --git a/ghost/admin/app/components/gh-members-list-item.hbs b/ghost/admin/app/components/gh-members-list-item.hbs index e18cf108f5..8cf99c1157 100644 --- a/ghost/admin/app/components/gh-members-list-item.hbs +++ b/ghost/admin/app/components/gh-members-list-item.hbs @@ -1,10 +1,5 @@
  • {{#if @member.is_loading}} - {{#if @isEditing}} -
    - -
    - {{/if}}
    @@ -13,13 +8,7 @@
    {{else}} - {{#if @isEditing}} -
    - -
    - {{/if}} - - +
    @@ -31,7 +20,7 @@
    - + {{#if (and @member.geolocation @member.geolocation.country)}} {{#if (eq @member.geolocation.country_code "US")}} {{@member.geolocation.region}}, US @@ -43,19 +32,17 @@ {{/if}} - + {{#if @member.createdAtUTC}} {{moment-format @member.createdAtUTC "D MMM YYYY"}} ({{moment-from-now @member.createdAtUTC}}) {{/if}} - - {{#unless @isEditing}} -
    - {{svg-jar "arrow-right" class="w6 h6 fill-midgrey pa1"}} -
    - {{/unless}} + +
    + {{svg-jar "arrow-right" class="w6 h6 fill-midgrey pa1"}} +
    {{/if}}
  • \ No newline at end of file diff --git a/ghost/admin/app/controllers/members.js b/ghost/admin/app/controllers/members.js index 8f14a71cd4..a494391e7f 100644 --- a/ghost/admin/app/controllers/members.js +++ b/ghost/admin/app/controllers/members.js @@ -37,13 +37,11 @@ export default class MembersController extends Controller { ]; @tracked members = A([]); - @tracked allSelected = false; @tracked searchText = ''; @tracked searchParam = ''; @tracked paidParam = null; @tracked label = null; @tracked modalLabel = null; - @tracked isEditing = false; @tracked showLabelModal = false; @tracked showDeleteMembersModal = false; @@ -117,20 +115,6 @@ export default class MembersController extends Controller { return this.paidParams.findBy('value', this.paidParam) || {value: '!unknown'}; } - get selectedCount() { - return this.allSelected ? this.members.length : 0; - } - - get selectAllLabel() { - let {members} = this; - - if (this.allSelected) { - return `All items selected (${formatNumber(members.length)})`; - } else { - return `Select all (${formatNumber(members.length)})`; - } - } - // Actions ----------------------------------------------------------------- @action @@ -141,23 +125,6 @@ export default class MembersController extends Controller { this.membersStats.fetch(); } - @action - toggleEditMode() { - if (this.isEditing) { - this.resetSelection(); - } else { - this.isEditing = true; - } - } - - @action - toggleSelectAll() { - if (this.members.length === 0) { - return this.allSelected = false; - } - this.allSelected = !this.allSelected; - } - @action search(e) { this.searchTask.perform(e.target.value); @@ -247,8 +214,6 @@ export default class MembersController extends Controller { // params is undefined when called as a "refresh" of the model let {label, paidParam, searchParam} = typeof params === 'undefined' ? this : params; - this.resetSelection(); - if (!searchParam) { this.resetSearch(); } @@ -313,7 +278,6 @@ export default class MembersController extends Controller { // reset and reload this.store.unloadAll('member'); - this.resetSelection(); this.reload(); return response.meta.stats; @@ -325,11 +289,6 @@ export default class MembersController extends Controller { this.searchText = ''; } - resetSelection() { - this.isEditing = false; - this.allSelected = false; - } - reload() { this.membersStats.invalidate(); this.membersStats.fetch(); diff --git a/ghost/admin/app/templates/members.hbs b/ghost/admin/app/templates/members.hbs index 9ccdd7e4f0..b896cda09d 100644 --- a/ghost/admin/app/templates/members.hbs +++ b/ghost/admin/app/templates/members.hbs @@ -57,49 +57,17 @@ {{/if}}
    - {{!-- overlaid on header to keep table column sizing --}} - {{#if this.isEditing}} -
    -
    -
    - - -
    - -
    - - -
    - {{/if}} -
      {{#if this.members}}
    1. - {{#if this.isEditing}} - {{!-- necessary because we add an extra column in the list items --}} -
      - {{/if}}
      {{this.listHeader}}
      Location
      Created
      -
      - {{!-- TODO: 🍆🖌 --}} - {{#if this.config.enableDeveloperExperiments}} - - {{/if}} -
      +
    2. @@ -131,7 +99,7 @@ {{#if this.showDeleteMembersModal}}