Site setting to support showing real names in posts. Also put back in type to search on site settings

Author: eviltrout

app/assets/javascripts/admin/controllers/admin_site_settings_controller.js

@@ -26,7 +26,9 @@ Discourse.AdminSiteSettingsController = Ember.ArrayController.extend(Discourse.P
     }
 
     var adminSettingsController = this;
-    return this.get('content').filter(function(item, index, enumerable) {
+
+    var maxResults = Em.isNone(filter) ? this.get('content.length') : 20;
+    return _.first(this.get('content').filter(function(item, index, enumerable) {
       if (adminSettingsController.get('onlyOverridden') && !item.get('overridden')) return false;
       if (filter) {
         if (item.get('setting').toLowerCase().indexOf(filter) > -1) return true;
@@ -36,20 +38,11 @@ Discourse.AdminSiteSettingsController = Ember.ArrayController.extend(Discourse.P
       }
 
       return true;
-    });
+    }), maxResults);
   }.property('filter', 'content.@each', 'onlyOverridden'),
 
   actions: {
 
-    /**
-      Changes the currently active filter
-
-      @method changeFilter
-    **/
-    changeFilter: function() {
-      this.set('filter', this.get('newFilter'));
-    },
-
     /**
       Reset a setting to its default value
 

app/assets/javascripts/admin/templates/site_settings.js.handlebars

@@ -6,8 +6,7 @@
   </label>
   </div>
   <div class='controls'>
-    {{textField value=newFilter}}
-    <button class="btn btn-primary" {{action changeFilter}}>{{i18n filter}}</button>
+    {{textField value=filter placeholderKey="type_to_filter"}}
   </div>
 
 </div>

app/assets/javascripts/discourse/models/post.js

@@ -32,6 +32,11 @@ Discourse.Post = Discourse.Model.extend({
   notDeleted: Em.computed.not('deleted'),
   userDeleted: Em.computed.empty('user_id'),
 
+  showName: function() {
+    var name = this.get('name');
+    return name && (name !== this.get('username'))  && Discourse.SiteSettings.display_name_on_posts;
+  }.property('name', 'username'),
+
   postDeletedBy: function() {
     if (this.get('firstPost')) { return this.get('topic.deleted_by'); }
     return this.get('deleted_by');

app/assets/javascripts/discourse/templates/post.js.handlebars

@@ -21,6 +21,11 @@
         <div {{bindAttr class=":contents byTopicCreator:topic-creator :trigger-expansion"}}>
           <a href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{avatar this imageSize="large"}}</a>
           <h3 {{bindAttr class="staff new_user"}}><a href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{breakUp username}}</a></h3>
+
+          {{#if showName}}
+          <h3><a href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{breakUp name}}</a></h3>
+          {{/if}}
+
           {{#if user_title}}<div class="user-title" {{action showPosterExpansion this}}>{{user_title}}</div>{{/if}}
         </div>
       {{else}}

app/models/site_setting.rb

@@ -270,6 +270,7 @@ class SiteSetting < ActiveRecord::Base
   # hidden setting only used by system
   setting(:uncategorized_category_id, -1, hidden: true)
 
+  client_setting(:display_name_on_posts, false)
   client_setting(:enable_names, true)
 
   def self.call_discourse_hub?

config/locales/client.cs.yml

@@ -1062,6 +1062,7 @@ cs:
 
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
+    type_to_filter: "zadejte text pro filtrování..."
 
     admin:
       title: 'Discourse Administrace'

config/locales/client.da.yml

@@ -683,6 +683,7 @@ da:
 
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
+    type_to_filter: "type to filter..."
 
     admin:
       title: 'Discourse Admin'

config/locales/client.de.yml

@@ -1049,6 +1049,7 @@ de:
 
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
+    type_to_filter: "Tippe etwas ein, um zu filtern..."
 
     admin:
       title: 'Discourse Administrator'

config/locales/client.en.yml

@@ -1074,7 +1074,7 @@ en:
 
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
-    filter: "filter"
+    type_to_filter: "type to filter..."
 
     admin:
       title: 'Discourse Admin'

config/locales/client.es.yml

@@ -793,6 +793,7 @@ es:
 
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
+    type_to_filter: "type to filter..."
 
     admin:
       title: 'Administrador'