From e143eb595fccf39ddcac3c622eb09249d93aa719 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Fri, 10 Apr 2015 09:49:26 +1000
Subject: [PATCH] UX: add link to group member from groups admin page UX:
remove uneeded refresh button from custom groups
---
.../javascripts/admin/controllers/admin-groups-type.js.es6 | 3 +++
.../javascripts/admin/routes/admin-groups-type.js.es6 | 6 ++++++
app/assets/javascripts/admin/templates/group_member.hbs | 2 +-
app/assets/javascripts/admin/templates/groups_type.hbs | 2 ++
4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6 b/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6
index 2d75d1911..eba51de4e 100644
--- a/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6
@@ -1,6 +1,9 @@
export default Ember.ArrayController.extend({
sortProperties: ['name'],
refreshingAutoGroups: false,
+ isAuto: function(){
+ return this.get('type') === 'automatic';
+ }.property('type'),
actions: {
refreshAutoGroups: function(){
diff --git a/app/assets/javascripts/admin/routes/admin-groups-type.js.es6 b/app/assets/javascripts/admin/routes/admin-groups-type.js.es6
index 4f944f9db..c8226f04d 100644
--- a/app/assets/javascripts/admin/routes/admin-groups-type.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-groups-type.js.es6
@@ -1,10 +1,16 @@
export default Discourse.Route.extend({
model(params) {
+ this.set("type", params.type);
return Discourse.Group.findAll().then(function(groups) {
return groups.filterBy("type", params.type);
});
},
+ setupController(controller, model){
+ controller.set("type", this.get("type"));
+ controller.set("model", model);
+ },
+
actions: {
newGroup() {
const self = this;
diff --git a/app/assets/javascripts/admin/templates/group_member.hbs b/app/assets/javascripts/admin/templates/group_member.hbs
index d94f2ebe8..1c344ba73 100644
--- a/app/assets/javascripts/admin/templates/group_member.hbs
+++ b/app/assets/javascripts/admin/templates/group_member.hbs
@@ -1 +1 @@
-{{avatar member imageSize="small"}} {{member.username}} {{#unless automatic}}<a class='remove' {{action "removeMember" member}}>{{fa-icon "times"}}</a>{{/unless}}
+<a href='{{unbound member.adminPath}}'>{{avatar member imageSize="small"}}</a> {{member.username}} {{#unless automatic}}<a class='remove' {{action "removeMember" member}}>{{fa-icon "times"}}</a>{{/unless}}
diff --git a/app/assets/javascripts/admin/templates/groups_type.hbs b/app/assets/javascripts/admin/templates/groups_type.hbs
index 0aec861a6..8188752a9 100644
--- a/app/assets/javascripts/admin/templates/groups_type.hbs
+++ b/app/assets/javascripts/admin/templates/groups_type.hbs
@@ -10,7 +10,9 @@
</ul>
<div class='controls'>
{{d-button action="newGroup" icon="plus" label="admin.groups.new"}}
+ {{#if controller.isAuto}}
{{d-button action="refreshAutoGroups" icon="refresh" label="admin.groups.refresh" disabled=refreshingAutoGroups}}
+ {{/if}}
</div>
</div>