Merge remote-tracking branch 'upstream/master'

* upstream/master:
  FIX: categories created by users who are deleted cannot be deleted
  Site setting to support showing real names in posts. Also put back in type to search on site settings
  Adjust ul,ol margins
  main logo size consistency fix
  FIX: Non-Admins couldn't send private messages through the new user expansion

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/routes/topic_route.js

@@ -19,7 +19,7 @@ Discourse.TopicRoute = Discourse.Route.extend({
 
     composePrivateMessage: function(user) {
       var self = this;
-      this.transitionTo('userPrivateMessages', user).then(function () {
+      this.transitionTo('userActivity', user).then(function () {
         self.controllerFor('userActivity').send('composePrivateMessage');
       });
     },

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/assets/stylesheets/desktop/header.scss

@@ -29,8 +29,7 @@
     }
   }
   #site-logo {
-    max-height: 40px;
-    max-width: 350px;
+    width: 122px;
   }
   .icon-home {
     font-size: 20px;

app/assets/stylesheets/desktop/topic-post.scss

@@ -39,7 +39,7 @@ h1 .topic-statuses .topic-status i {margin-right: 5px;}
   margin-left: -8px;
 }
 
-.avoid-tab { 
+.avoid-tab {
   padding-top: 25px;
   .topic-meta-data-inside {margin-top: -30px;}
 }
@@ -131,7 +131,7 @@ nav.post-controls {
     border: none;
     margin-left: 3px;
     transition: all linear 0.15s;
-    outline: none; 
+    outline: none;
          &:hover {
           background: #eee;
           color: #888;
@@ -394,12 +394,12 @@ span.post-count {
 #topic-title {
   z-index: 1000;
   padding: 14px 0 8px 0;
-  h1 { 
-    line-height: 1.2em; 
-    overflow: hidden; 
+  h1 {
+    line-height: 1.2em;
+    overflow: hidden;
   }
   .topic-statuses {
-    margin-top: -2px; 
+    margin-top: -2px;
     .icon-pushpin {margin-top: -1px;}
   }
   .star {font-size: 20px; margin-top: 8px;}
@@ -435,7 +435,7 @@ iframe {
 }
 
 .extra-info-wrapper {
-  float: left; 
+  float: left;
   width: 78%;
   .topic-statuses {margin-right: 5px;}
 }
@@ -499,7 +499,7 @@ iframe {
 .contents .cooked {
   padding-right: 30px;
   h1, h2, h3 {margin: 10px 0;}
-  ul, ol {margin: 15px 0;}
+  ul, ol {margin: 0 15px;}
   li p {margin: 3px 0;}
 }
 

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'

config/locales/client.fr.yml

@@ -1032,6 +1032,7 @@ fr:
       create_post: "Répondre / Voir"
       readonly: "Voir"
   admin_js:
+    type_to_filter: "Commencez à taper pour filtrer..."
     admin:
       title: 'Administation Discourse'
       moderator: 'Modérateur'

config/locales/client.id.yml

@@ -638,6 +638,7 @@ id:
 
   # 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.it.yml

@@ -1001,6 +1001,7 @@ it:
 
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
+    type_to_filter: "scrivi per filtrare..."
 
     admin:
       title: 'Amministrazione Discourse'

config/locales/client.ko.yml

@@ -841,6 +841,7 @@ ko:
 
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
+    type_to_filter: "필터를 입력하세요"
 
     admin:
       title: 'Discourse 관리자'

config/locales/client.nb_NO.yml

@@ -914,6 +914,7 @@ nb_NO:
 
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
+    type_to_filter: "skriv for å filtrere..."
 
     admin:
       title: 'Discourse Admin'

config/locales/client.nl.yml

@@ -1014,6 +1014,7 @@ nl:
 
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
+    type_to_filter: typ om te filteren...
 
     admin:
       title: Discourse Beheer

config/locales/client.pseudo.yml

@@ -969,6 +969,7 @@ pseudo:
       ƀřóŵšéř íš ťóó ółď ťó ŵóřǩ óɳ ťĥíš Ďíščóůřšé ƒóřůɱ</á>. Рłéášé <á ĥřéƒ="ĥťťƿ://ƀřóŵšéĥáƿƿý.čóɱ">ůƿǧřáďé
       ýóůř ƀřóŵšéř</á>. ]]'
   admin_js:
+    type_to_filter: '[[ ťýƿé ťó ƒíłťéř... ]]'
     admin:
       title: '[[ Ďíščóůřšé Áďɱíɳ ]]'
       moderator: '[[ Ϻóďéřáťóř ]]'

config/locales/client.pt.yml

@@ -602,6 +602,7 @@ pt:
 
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
+    type_to_filter: "escreve para filtrar..."
 
     admin:
       title: 'Discourse Admin'

config/locales/client.pt_BR.yml

@@ -1069,6 +1069,7 @@ pt_BR:
 
   # Essa seção é para o javascript para i18n no admin
   admin_js:
+    type_to_filter: "escreva para filtrar..."
 
     admin:
       title: 'Discourse Admin'

config/locales/client.ru.yml

@@ -1085,6 +1085,7 @@ ru:
       create_post: 'Отвечать / Просматривать'
       readonly: Просматривать
   admin_js:
+    type_to_filter: 'Введите текст для фильтрации...'
     admin:
       title: 'Discourse Admin'
       moderator: Модератор

config/locales/client.sv.yml

@@ -788,6 +788,7 @@ sv:
 
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
+    type_to_filter: "skriv för att filtrera..."
 
     admin:
       title: 'Discourse Admin'

config/locales/client.zh_CN.yml

@@ -1075,6 +1075,7 @@ zh_CN:
 
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
+    type_to_filter: "输入过滤条件……"
 
     admin:
       title: '论道 管理'

config/locales/client.zh_TW.yml

@@ -968,6 +968,7 @@ zh_TW:
       readonly: "觀看"
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
+    type_to_filter: "輸入過濾條件……"
 
     admin:
       title: '論道 管理'

config/locales/server.en.yml

@@ -722,6 +722,7 @@ en:
     dominating_topic_minimum_percent: "What percentage of posts a user has to make in a topic before we consider it dominating."
 
     enable_names: "Allow users to show their full names"
+    display_name_on_posts: "Also show a user's full name on their posts"
 
   notification_types:
     mentioned: "%{display_username} mentioned you in %{link}"

lib/user_destroyer.rb

@@ -42,6 +42,19 @@ def destroy(user, opts={})
             b.record_match! if b
           end
           Post.with_deleted.where(user_id: user.id).update_all("user_id = NULL")
+
+          # If this user created categories, fix those up:
+          categories = Category.where(user_id: user.id).all
+          categories.each do |c|
+            c.user_id = Discourse.system_user.id
+            c.save!
+            if topic = Topic.with_deleted.where(id: c.topic_id).first
+              topic.try(:recover!)
+              topic.user_id = Discourse.system_user.id
+              topic.save!
+            end
+          end
+
           StaffActionLogger.new(@staff).log_user_deletion(user, opts.slice(:context))
           DiscourseHub.unregister_nickname(user.username) if SiteSetting.call_discourse_hub?
           MessageBus.publish "/file-change", ["refresh"], user_ids: [user.id]

spec/components/user_destroyer_spec.rb

@@ -238,6 +238,17 @@
         UserDestroyer.new(@admin).destroy(@user, {block_ip: true})
       end
     end
+
+    context 'user created a category' do
+      let!(:category) { Fabricate(:category, user: @user) }
+
+      it "assigns the system user to the categories" do
+        UserDestroyer.new(@admin).destroy(@user, {delete_posts: true})
+        category.reload.user_id.should == Discourse.system_user.id
+        category.topic.should be_present
+        category.topic.user_id.should == Discourse.system_user.id
+      end
+    end
   end
 
 end