displays proposal created within management layout

This commit is contained in:
rgarcia
2015-10-13 14:57:27 +02:00
parent 06e35a032d
commit dc93ea6dba
6 changed files with 15 additions and 6 deletions

View File

@@ -34,7 +34,8 @@ module CommentableActions
if @resource.save_with_captcha if @resource.save_with_captcha
track_event track_event
redirect_to @resource, notice: t('flash.actions.create.notice', resource_name: "#{resource_name.capitalize}") redirect_path = url_for(controller: controller_name, action: :show, id: @resource.id)
redirect_to redirect_path, notice: t('flash.actions.create.notice', resource_name: "#{resource_name.capitalize}")
else else
load_featured_tags load_featured_tags
set_resource_instance set_resource_instance

View File

@@ -3,7 +3,7 @@ class Management::ProposalsController < Management::BaseController
include CommentableActions include CommentableActions
before_action :check_verified_user, except: :print before_action :check_verified_user, except: :print
before_action :set_proposal, only: :vote before_action :set_proposal, only: [:vote, :show]
before_action :parse_search_terms, only: :index before_action :parse_search_terms, only: :index
has_orders %w{hot_score confidence_score created_at most_commented random}, only: [:index, :print] has_orders %w{hot_score confidence_score created_at most_commented random}, only: [:index, :print]
@@ -42,9 +42,14 @@ class Management::ProposalsController < Management::BaseController
managed_user managed_user
end end
#Duplicated in application_controller. Move to a concenrn. ### Duplicated in application_controller. Move to a concenrn.
def set_proposal_votes(proposals) def set_proposal_votes(proposals)
@proposal_votes = current_user ? current_user.proposal_votes(proposals) : {} @proposal_votes = current_user ? current_user.proposal_votes(proposals) : {}
end end
def set_comment_flags(comments)
@comment_flags = current_user ? current_user.comment_flags(comments) : {}
end
###
end end

View File

@@ -0,0 +1 @@
<%= render template: 'proposals/show' %>

View File

@@ -88,7 +88,7 @@
<%= render 'shared/tags', taggable: @proposal %> <%= render 'shared/tags', taggable: @proposal %>
<div class="js-moderator-proposal-actions moderator-actions"> <div class="js-moderator-proposal-actions moderator-actions">
<%= render 'actions', proposal: @proposal %> <%= render 'proposals/actions', proposal: @proposal %>
</div> </div>
</div> </div>
@@ -108,4 +108,4 @@
</div> </div>
</section> </section>
<% end %> <% end %>
<%= render "comments" %> <%= render "proposals/comments" %>

View File

@@ -189,7 +189,7 @@ Rails.application.routes.draw do
get 'sign_in', to: 'sessions#create' get 'sign_in', to: 'sessions#create'
resource :session, only: [:create, :destroy] resource :session, only: [:create, :destroy]
resources :proposals, only: [:index, :new, :create] do resources :proposals, only: [:index, :new, :create, :show] do
member do member do
post :vote post :vote
end end

View File

@@ -36,6 +36,8 @@ feature 'Proposals' do
expect(page).to have_content 'http://youtube.com' expect(page).to have_content 'http://youtube.com'
expect(page).to have_content user.name expect(page).to have_content user.name
expect(page).to have_content I18n.l(Proposal.last.created_at.to_date) expect(page).to have_content I18n.l(Proposal.last.created_at.to_date)
expect(URI.parse(current_url).path).to eq(management_proposal_path(Proposal.last))
end end
scenario "Should not allow unverified users to create proposals" do scenario "Should not allow unverified users to create proposals" do