From 5fdd81ac77ce8a438e90fdec6b3cf674e17188c3 Mon Sep 17 00:00:00 2001 From: Rimian Perkins Date: Wed, 13 Nov 2019 15:27:32 +1100 Subject: [PATCH] link to user admin --- .../discourse/models/admin-subscription.js.es6 | 18 +++++++++--------- ...plugins-discourse-patrons-subscriptions.hbs | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/assets/javascripts/discourse/models/admin-subscription.js.es6 b/assets/javascripts/discourse/models/admin-subscription.js.es6 index 0c39e84..c43182e 100644 --- a/assets/javascripts/discourse/models/admin-subscription.js.es6 +++ b/assets/javascripts/discourse/models/admin-subscription.js.es6 @@ -4,15 +4,15 @@ import { ajax } from "discourse/lib/ajax"; const AdminSubscription = Discourse.Model.extend({ @computed("metadata") - user(metadata) { - console.log(metadata); - if (metadata.user_id && metadata.username) { - return EmberObject.create({ - id: metadata.user_id, - username: metadata.username - }); - } - return false; + metadataUserExists(metadata) { + return metadata.user_id && metadata.username; + }, + + @computed("metadata") + subscriptionUserPath(metadata) { + return Discourse.getURL( + `/admin/users/${metadata.user_id}/${metadata.username}` + ); } }); diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs index c06fd52..86ca6aa 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs @@ -12,10 +12,10 @@ {{#each model as |subscription|}} - {{#if subscription.user}} - {{#link-to 'adminUser' subscription.user}} - {{subscription.user.username}} - {{/link-to}} + {{#if subscription.metadataUserExists}} + + {{subscription.metadata.username}} + {{/if}} {{subscription.customer}}