From c743a985a415b4701a86538b99b98be78a2b8d92 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 23 Dec 2013 15:46:00 +0100 Subject: [PATCH 1/2] Allow groups to be used as aliases for user mention when configured by the admin a group can be found through the @mentions feature in both the compose/reply and the private message user-selectors and once selected the mention will be replaced by the list of users in the group --- app/assets/javascripts/admin/models/group.js | 12 +++++++ .../admin/templates/groups.js.handlebars | 20 +++++++---- .../javascripts/discourse/lib/autocomplete.js | 23 +++++++----- .../javascripts/discourse/lib/user_search.js | 30 ++++++++++++---- .../templates/composer.js.handlebars | 1 + .../modal/invite_private.js.handlebars | 2 +- .../discourse/views/composer/composer_view.js | 11 ++++-- .../discourse/views/user_selector_view.js | 35 ++++++++++++++++--- app/controllers/admin/groups_controller.rb | 16 +++++---- app/controllers/users_controller.rb | 8 ++++- app/models/group.rb | 17 +++++++++ app/serializers/basic_group_serializer.rb | 2 +- config/locales/client.en.yml | 8 ++++- ...0140102104229_add_alias_level_to_groups.rb | 5 +++ .../admin/groups_controller_spec.rb | 3 +- 15 files changed, 154 insertions(+), 39 deletions(-) create mode 100644 db/migrate/20140102104229_add_alias_level_to_groups.rb diff --git a/app/assets/javascripts/admin/models/group.js b/app/assets/javascripts/admin/models/group.js index ce556edd88f..55b4da0e4cf 100644 --- a/app/assets/javascripts/admin/models/group.js +++ b/app/assets/javascripts/admin/models/group.js @@ -35,6 +35,16 @@ Discourse.Group = Discourse.Model.extend({ return usernames; }.property('users'), + validValues: function() { + return Em.A([ + { name: I18n.t("admin.groups.alias_levels.nobody"), value: 0}, + { name: I18n.t("admin.groups.alias_levels.only_admins"), value: 1}, + { name: I18n.t("admin.groups.alias_levels.mods_and_admins"), value: 2}, + { name: I18n.t("admin.groups.alias_levels.members_mods_and_admins"), value: 3}, + { name: I18n.t("admin.groups.alias_levels.everyone"), value: 99} + ]); + }.property(), + destroy: function(){ if(!this.id) return; @@ -58,6 +68,7 @@ Discourse.Group = Discourse.Model.extend({ return Discourse.ajax("/admin/groups", {type: "POST", data: { group: { name: this.get('name'), + alias_level: this.get('alias_level'), usernames: this.get('usernames') } }}).then(function(resp) { @@ -83,6 +94,7 @@ Discourse.Group = Discourse.Model.extend({ data: { group: { name: this.get('name'), + alias_level: this.get('alias_level'), usernames: this.get('usernames') } }, diff --git a/app/assets/javascripts/admin/templates/groups.js.handlebars b/app/assets/javascripts/admin/templates/groups.js.handlebars index cfff5e5a2ce..79b3c66104c 100644 --- a/app/assets/javascripts/admin/templates/groups.js.handlebars +++ b/app/assets/javascripts/admin/templates/groups.js.handlebars @@ -24,15 +24,23 @@ {{textField value=name placeholderKey="admin.groups.name_placeholder"}} {{/if}} - {{userSelector usernames=usernames id="group-users" placeholderKey="admin.groups.selector_placeholder" tabindex="1" disabledBinding="automatic"}} +
+ +
+ {{userSelector usernames=usernames id="group-users" placeholderKey="admin.groups.selector_placeholder" tabindex="1" disabledBinding="automatic"}} +
+
+
+ +
+ {{combobox valueAttribute="value" value=alias_level content=validValues}} +
+
+ {{#unless automatic}} - - {{#if id}} {{i18n admin.customize.delete}} - {{/if}} - {{else}} - {{i18n admin.groups.can_not_edit_automatic}} {{/unless}}
{{/with}} diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js b/app/assets/javascripts/discourse/lib/autocomplete.js index 33d3715a1eb..9f65d6b99ae 100644 --- a/app/assets/javascripts/discourse/lib/autocomplete.js +++ b/app/assets/javascripts/discourse/lib/autocomplete.js @@ -92,19 +92,26 @@ $.fn.autocomplete = function(options) { // dump what we have in single mode, just in case inputSelectedItems = []; } - var d = $("
" + (transformed || item) + "
"); - var prev = me.parent().find('.item:last'); - if (prev.length === 0) { - me.parent().prepend(d); - } else { - prev.after(d); + if (!_.isArray(transformed)) { + transformed = [transformed || item]; } - inputSelectedItems.push(item); + var divs = transformed.map(function(itm) { + var d = $("
" + (itm) + "
"); + var prev = me.parent().find('.item:last'); + if (prev.length === 0) { + me.parent().prepend(d); + } else { + prev.after(d); + } + inputSelectedItems.push(itm); + return divs; + }); + if (options.onChangeItems) { options.onChangeItems(inputSelectedItems); } - d.find('a').click(function() { + $(divs).find('a').click(function() { closeAutocomplete(); inputSelectedItems.splice($.inArray(item, inputSelectedItems), 1); $(this).parent().parent().remove(); diff --git a/app/assets/javascripts/discourse/lib/user_search.js b/app/assets/javascripts/discourse/lib/user_search.js index 3a8aae6dd29..c0a11c80f70 100644 --- a/app/assets/javascripts/discourse/lib/user_search.js +++ b/app/assets/javascripts/discourse/lib/user_search.js @@ -9,11 +9,12 @@ var cache = {}; var cacheTopicId = null; var cacheTime = null; -var debouncedSearch = Discourse.debouncePromise(function(term, topicId) { +var debouncedSearch = Discourse.debouncePromise(function(term, topicId, include_groups) { return Discourse.ajax('/users/search/users', { data: { term: term, - topic_id: topicId + topic_id: topicId, + include_groups: include_groups } }).then(function (r) { cache[term] = r; @@ -26,6 +27,7 @@ Discourse.UserSearch = { search: function(options) { var term = options.term || ""; + var include_groups = options.include_groups || false; var exclude = options.exclude || []; var topicId = options.topicId; var limit = options.limit || 5; @@ -46,21 +48,35 @@ Discourse.UserSearch = { cacheTopicId = topicId; var organizeResults = function(r) { - var result = []; + var users = [], groups = [], results = []; _.each(r.users,function(u) { if (exclude.indexOf(u.username) === -1) { - result.push(u); + users.push(u); + results.push(u); } - if (result.length > limit) return false; + if (results.length > limit) return false; return true; }); - promise.resolve(result); + + _.each(r.groups,function(g) { + if (results.length > limit) return false; + if (exclude.indexOf(g.name) === -1) { + groups.push(g); + results.push(g); + } + return true; + }); + + results.users = users; + results.groups = groups; + + promise.resolve(results); }; if (cache[term]) { organizeResults(cache[term]); } else { - debouncedSearch(term, topicId).then(organizeResults); + debouncedSearch(term, topicId, include_groups).then(organizeResults); } return promise; } diff --git a/app/assets/javascripts/discourse/templates/composer.js.handlebars b/app/assets/javascripts/discourse/templates/composer.js.handlebars index c188611cc0f..d0c8c9bb457 100644 --- a/app/assets/javascripts/discourse/templates/composer.js.handlebars +++ b/app/assets/javascripts/discourse/templates/composer.js.handlebars @@ -28,6 +28,7 @@ {{userSelector topicId=controller.controllers.topic.model.id excludeCurrentUser="true" id="private-message-users" + include_groups="true" class="span8" placeholderKey="composer.users_placeholder" tabindex="1" diff --git a/app/assets/javascripts/discourse/templates/modal/invite_private.js.handlebars b/app/assets/javascripts/discourse/templates/modal/invite_private.js.handlebars index a427dc0acd3..4fab3aa1836 100644 --- a/app/assets/javascripts/discourse/templates/modal/invite_private.js.handlebars +++ b/app/assets/javascripts/discourse/templates/modal/invite_private.js.handlebars @@ -10,7 +10,7 @@ {{i18n topic.invite_private.success}} {{else}} - {{userSelector single=true allowAny=true usernames=emailOrUsername placeholderKey="topic.invite_private.email_or_username_placeholder"}} + {{userSelector single=true allowAny=true usernames=emailOrUsername include_groups="true" placeholderKey="topic.invite_private.email_or_username_placeholder"}} {{/if}}
diff --git a/app/assets/javascripts/discourse/views/composer/composer_view.js b/app/assets/javascripts/discourse/views/composer/composer_view.js index 64e1ee98f88..9c468b47cbe 100644 --- a/app/assets/javascripts/discourse/views/composer/composer_view.js +++ b/app/assets/javascripts/discourse/views/composer/composer_view.js @@ -183,11 +183,18 @@ Discourse.ComposerView = Discourse.View.extend(Ember.Evented, { dataSource: function(term) { return Discourse.UserSearch.search({ term: term, - topicId: composerView.get('controller.controllers.topic.model.id') + topicId: composerView.get('controller.controllers.topic.model.id'), + include_groups: true }); }, key: "@", - transformComplete: function(v) { return v.username; } + transformComplete: function(v) { + if (v.username) { + return v.username; + } else { + return v.usernames.join(", @"); + } + } }); this.editor = editor = Discourse.Markdown.createEditor({ diff --git a/app/assets/javascripts/discourse/views/user_selector_view.js b/app/assets/javascripts/discourse/views/user_selector_view.js index 6517c8e2922..f3ce8a7f0f4 100644 --- a/app/assets/javascripts/discourse/views/user_selector_view.js +++ b/app/assets/javascripts/discourse/views/user_selector_view.js @@ -4,7 +4,6 @@ Discourse.UserSelector = Discourse.TextField.extend({ var userSelectorView = this; var selected = []; - var transformTemplate = Handlebars.compile("{{avatar this imageSize=\"tiny\"}} {{this.username}}"); $(this.get('element')).val(this.get('usernames')).autocomplete({ template: Discourse.UserSelector.templateFunction(), @@ -20,9 +19,17 @@ Discourse.UserSelector = Discourse.TextField.extend({ return Discourse.UserSearch.search({ term: term, topicId: userSelectorView.get('topicId'), - exclude: exclude + exclude: exclude, + include_groups: userSelectorView.get('include_groups') }); }, + transformComplete: function(v) { + if (v.username) { + return v.username; + } else { + return v.usernames; + } + }, onChangeItems: function(items) { items = _.map(items, function(i) { @@ -36,8 +43,6 @@ Discourse.UserSelector = Discourse.TextField.extend({ selected = items; }, - transformComplete: transformTemplate, - reverseTransform: function(i) { return { username: i }; } @@ -47,19 +52,39 @@ Discourse.UserSelector = Discourse.TextField.extend({ }); +Handlebars.registerHelper("showMax", function(context, block){ + var maxLength = parseInt(block.hash.max) || 3; + if (context.length > maxLength){ + return context.slice(0, maxLength).join(", ") + ", +" + (context.length - maxLength); + } else { + return context.join(", "); + } + +}); + Discourse.UserSelector.reopenClass({ // I really want to move this into a template file, but I need a handlebars template here, not an ember one templateFunction: function(){ this.compiled = this.compiled || Handlebars.compile("
" + "" + "
"); return this.compiled; diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index dfc97b1d0a1..21c7d2156db 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -16,16 +16,20 @@ class Admin::GroupsController < Admin::AdminController def update group = Group.find(params[:id].to_i) + if group.automatic - can_not_modify_automatic + # we can only change the alias level on automatic groups + group.alias_level = params[:group][:alias_level] else group.usernames = params[:group][:usernames] + group.alias_level = params[:group][:alias_level] group.name = params[:group][:name] if params[:group][:name] - if group.save - render json: success_json - else - render_json_error group - end + end + + if group.save + render json: success_json + else + render_json_error group end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6174652d2d7..c49e274ea96 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -264,7 +264,13 @@ class UsersController < ApplicationController user_fields = [:username, :use_uploaded_avatar, :upload_avatar_template, :uploaded_avatar_id] user_fields << :name if SiteSetting.enable_names? - render json: { users: results.as_json(only: user_fields, methods: :avatar_template) } + to_render = { users: results.as_json(only: user_fields, methods: :avatar_template) } + + if params[:include_groups] == "true" + to_render[:groups] = Group.search_group(term, current_user).map {|m| {:name=>m.name, :usernames=> m.usernames.split(",")} } + end + + render json: to_render end # [LEGACY] avatars in quotes/oneboxes might still be pointing to this route diff --git a/app/models/group.rb b/app/models/group.rb index 8728fc3f673..f217b48db7f 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -99,6 +99,23 @@ class Group < ActiveRecord::Base lookup_group(name) || refresh_automatic_group!(name) end + def self.search_group(name, current_user) + + levels = [99] + if current_user.admin? + levels = [99, 1, 2, 3] + elsif current_user.moderator? + levels = [99, 2, 3] + end + + return Group.where("name LIKE :term_like AND (" + + " alias_level in (:levels)" + + " OR (alias_level = 3 AND id in (" + + "SELECT group_id FROM group_users WHERE user_id= :user_id)" + + ")" + + ")", term_like: "#{name.downcase}%", levels: levels, user_id: current_user.id) + end + def self.lookup_group(name) if id = AUTO_GROUPS[name] Group.where(id: id).first diff --git a/app/serializers/basic_group_serializer.rb b/app/serializers/basic_group_serializer.rb index 81216da688b..7c56bee4c6f 100644 --- a/app/serializers/basic_group_serializer.rb +++ b/app/serializers/basic_group_serializer.rb @@ -1,3 +1,3 @@ class BasicGroupSerializer < ApplicationSerializer - attributes :id, :automatic, :name, :user_count + attributes :id, :automatic, :name, :user_count, :alias_level end diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 21c9292ca92..018f582a9e0 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1219,10 +1219,16 @@ en: selector_placeholder: "add users" name_placeholder: "Group name, no spaces, same as username rule" about: "Edit your group membership and names here" - can_not_edit_automatic: "Automatic group membership is determined automatically, administer users to assign roles and trust levels" delete: "Delete" delete_confirm: "Delete this group?" delete_failed: "Unable to delete group. If this is an automatic group, it cannot be destroyed." + alias_levels: + title: "Who can use this group as an alias?" + nobody: "Nobody" + only_admins: "Only admins" + mods_and_admins: "Only moderators and Admins" + members_mods_and_admins: "Only group members, moderators and admins" + everyone: "Everyone" api: generate_master: "Generate Master API Key" diff --git a/db/migrate/20140102104229_add_alias_level_to_groups.rb b/db/migrate/20140102104229_add_alias_level_to_groups.rb new file mode 100644 index 00000000000..9cee03f581f --- /dev/null +++ b/db/migrate/20140102104229_add_alias_level_to_groups.rb @@ -0,0 +1,5 @@ +class AddAliasLevelToGroups < ActiveRecord::Migration + def change + add_column :groups, :alias_level, :integer, default: 0 + end +end diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb index 6712bd4ba80..f3f130e4666 100644 --- a/spec/controllers/admin/groups_controller_spec.rb +++ b/spec/controllers/admin/groups_controller_spec.rb @@ -21,7 +21,8 @@ describe Admin::GroupsController do "id"=>group.id, "name"=>group.name, "user_count"=>1, - "automatic"=>false + "automatic"=>false, + "alias_level"=>0 }] end From 7cbe92d5b6dedccd500267e640f5253ca4b430fa Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Wed, 8 Jan 2014 03:47:01 +1100 Subject: [PATCH 2/2] move alias levels into enums --- app/assets/javascripts/admin/models/group.js | 19 +++++++++++----- app/models/group.rb | 23 ++++++++++++++++---- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/admin/models/group.js b/app/assets/javascripts/admin/models/group.js index 55b4da0e4cf..cc13392fd27 100644 --- a/app/assets/javascripts/admin/models/group.js +++ b/app/assets/javascripts/admin/models/group.js @@ -1,6 +1,15 @@ Discourse.Group = Discourse.Model.extend({ loaded: false, + + ALIAS_LEVELS : { + "nobody": 0, + "only_admins": 1, + "mods_and_admins": 2, + "members_mods_and_admins": 3, + "everyone": 99 + }, + userCountDisplay: function(){ var c = this.get('user_count'); // don't display zero its ugly @@ -37,11 +46,11 @@ Discourse.Group = Discourse.Model.extend({ validValues: function() { return Em.A([ - { name: I18n.t("admin.groups.alias_levels.nobody"), value: 0}, - { name: I18n.t("admin.groups.alias_levels.only_admins"), value: 1}, - { name: I18n.t("admin.groups.alias_levels.mods_and_admins"), value: 2}, - { name: I18n.t("admin.groups.alias_levels.members_mods_and_admins"), value: 3}, - { name: I18n.t("admin.groups.alias_levels.everyone"), value: 99} + { name: I18n.t("admin.groups.alias_levels.nobody"), value: this.ALIAS_LEVELS.nobody}, + { name: I18n.t("admin.groups.alias_levels.only_admins"), value: this.ALIAS_LEVELS.only_admins}, + { name: I18n.t("admin.groups.alias_levels.mods_and_admins"), value: this.ALIAS_LEVELS.mods_and_admins}, + { name: I18n.t("admin.groups.alias_levels.members_mods_and_admins"), value: this.ALIAS_LEVELS.members_mods_and_admins}, + { name: I18n.t("admin.groups.alias_levels.everyone"), value: this.ALIAS_LEVELS.everyone} ]); }.property(), diff --git a/app/models/group.rb b/app/models/group.rb index f217b48db7f..fb28a5bac39 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -21,6 +21,16 @@ class Group < ActiveRecord::Base :trust_level_5 => 15 } + ALIAS_LEVELS = { + :nobody => 0, + :only_admins => 1, + :mods_and_admins => 2, + :members_mods_and_admins => 3, + :everyone => 99 + } + + validate :alias_level, inclusion: { in: ALIAS_LEVELS.values} + def self.trust_group_ids (10..19).to_a end @@ -101,16 +111,21 @@ class Group < ActiveRecord::Base def self.search_group(name, current_user) - levels = [99] + levels = [ALIAS_LEVELS[:everyone]] if current_user.admin? - levels = [99, 1, 2, 3] + levels = [ALIAS_LEVELS[:everyone], + ALIAS_LEVELS[:only_admins], + ALIAS_LEVELS[:mods_and_admins], + ALIAS_LEVELS[:members_mods_and_admins]] elsif current_user.moderator? - levels = [99, 2, 3] + levels = [ALIAS_LEVELS[:everyone], + ALIAS_LEVELS[:mods_and_admins], + ALIAS_LEVELS[:members_mods_and_admins]] end return Group.where("name LIKE :term_like AND (" + " alias_level in (:levels)" + - " OR (alias_level = 3 AND id in (" + + " OR (alias_level = #{ALIAS_LEVELS[:everyone]} AND id in (" + "SELECT group_id FROM group_users WHERE user_id= :user_id)" + ")" + ")", term_like: "#{name.downcase}%", levels: levels, user_id: current_user.id)