From 15dbce58866beb5d95adae24ee2d2cb5eb682a3a Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 24 Apr 2015 15:44:59 -0400 Subject: [PATCH] Show pending posts count in modal when your posts are enqueued --- .../javascripts/discourse/controllers/composer.js.es6 | 2 +- .../discourse/controllers/post-enqueued.js.es6 | 1 + .../javascripts/discourse/routes/application.js.es6 | 4 ++-- .../discourse/templates/modal/post-enqueued.hbs | 2 ++ app/models/queued_post.rb | 6 +++++- app/serializers/new_post_result_serializer.rb | 11 ++++++++++- config/locales/client.en.yml | 3 +++ lib/new_post_manager.rb | 1 + lib/new_post_result.rb | 1 + spec/components/new_post_manager_spec.rb | 3 ++- 10 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 app/assets/javascripts/discourse/controllers/post-enqueued.js.es6 diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index caf3632ee11..bdbe52b9c89 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -228,7 +228,7 @@ export default DiscourseController.extend({ }).then(function(result) { if (result.responseJson.action === "enqueued") { - self.send('postWasEnqueued'); + self.send('postWasEnqueued', {pending_count: result.responseJson.pending_count }); self.destroyDraft(); self.close(); return result; diff --git a/app/assets/javascripts/discourse/controllers/post-enqueued.js.es6 b/app/assets/javascripts/discourse/controllers/post-enqueued.js.es6 new file mode 100644 index 00000000000..77c79b724a7 --- /dev/null +++ b/app/assets/javascripts/discourse/controllers/post-enqueued.js.es6 @@ -0,0 +1 @@ +export default Ember.Controller.extend(); diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6 index 16bbdbebc5a..55967c0dbd9 100644 --- a/app/assets/javascripts/discourse/routes/application.js.es6 +++ b/app/assets/javascripts/discourse/routes/application.js.es6 @@ -37,8 +37,8 @@ const ApplicationRoute = Discourse.Route.extend({ this.controllerFor('topic-entrance').send('show', data); }, - postWasEnqueued() { - showModal('post-enqueued', {title: 'queue.approval.title' }); + postWasEnqueued(details) { + showModal('post-enqueued', {model: details, title: 'queue.approval.title' }); }, composePrivateMessage(user, post) { diff --git a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs index 050d02dcf19..ad547994a39 100644 --- a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs +++ b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs @@ -1,5 +1,7 @@

{{i18n "queue.approval.description"}}

+ +

{{{i18n "queue.approval.pending_posts" count=model.pending_count}}}

{{d-button action="closeModal" class="btn-primary" label="queue.approval.ok"}} diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb index eaab5d6d6a5..7a30ceb1d53 100644 --- a/app/models/queued_post.rb +++ b/app/models/queued_post.rb @@ -28,8 +28,12 @@ class QueuedPost < ActiveRecord::Base where(queue: visible_queues.to_a) end + def self.new_posts + visible.where(state: states[:new]) + end + def self.new_count - visible.where(state: states[:new]).count + new_posts.count end def visible? diff --git a/app/serializers/new_post_result_serializer.rb b/app/serializers/new_post_result_serializer.rb index ff7330cdd47..da3b7285e2e 100644 --- a/app/serializers/new_post_result_serializer.rb +++ b/app/serializers/new_post_result_serializer.rb @@ -4,7 +4,8 @@ class NewPostResultSerializer < ApplicationSerializer attributes :action, :post, :errors, - :success + :success, + :pending_count def post post_serializer = PostSerializer.new(object.post, scope: scope, root: false) @@ -36,4 +37,12 @@ class NewPostResultSerializer < ApplicationSerializer object.action end + def pending_count + object.pending_count + end + + def include_pending_count? + pending_count.present? + end + end diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 1bf579bc35e..d6c6c633275 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -240,6 +240,9 @@ en: approval: title: "Post Needs Approval" description: "We've received your new post but it needs to be approved by a moderator before it will appear. Please be patient." + pending_posts: + one: "You have 1 post pending." + other: "You have {{count}} posts pending." ok: "OK" user_action: diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb index cc3e7c01fd0..cde9357f6df 100644 --- a/lib/new_post_manager.rb +++ b/lib/new_post_manager.rb @@ -67,6 +67,7 @@ class NewPostManager result.queued_post = post result.check_errors_from(enqueuer) + result.pending_count = QueuedPost.new_posts.where(user_id: @user.id).count result end diff --git a/lib/new_post_result.rb b/lib/new_post_result.rb index a14f0458a54..938513078d3 100644 --- a/lib/new_post_result.rb +++ b/lib/new_post_result.rb @@ -6,6 +6,7 @@ class NewPostResult attr_reader :action attr_accessor :post attr_accessor :queued_post + attr_accessor :pending_count def initialize(action, success=false) @action = action diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb index ebc8ae5eca1..9bc7e606163 100644 --- a/spec/components/new_post_manager_spec.rb +++ b/spec/components/new_post_manager_spec.rb @@ -109,8 +109,9 @@ describe NewPostManager do expect(enqueued.post_options['title']).to eq('this is the title of the queued post') expect(result.action).to eq(:enqueued) expect(result).to be_success + expect(result.pending_count).to eq(1) expect(result.post).to be_blank - expect(QueuedPost.new_count).to be(1) + expect(QueuedPost.new_count).to eq(1) expect(@counter).to be(0) end