From 74b92ca317d91f760a3c05f9cdbd3f53bb40f222 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 5 Oct 2015 18:08:08 +0200 Subject: [PATCH] tmp commit manager vote --- .../management/proposals_controller.rb | 18 ++++++++++++++++++ app/helpers/admin_helper.rb | 2 +- app/views/management/proposals/index.html.erb | 1 + app/views/proposals/index.html.erb | 2 +- config/routes.rb | 1 + 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 app/controllers/management/proposals_controller.rb create mode 100644 app/views/management/proposals/index.html.erb diff --git a/app/controllers/management/proposals_controller.rb b/app/controllers/management/proposals_controller.rb new file mode 100644 index 000000000..da643d4a4 --- /dev/null +++ b/app/controllers/management/proposals_controller.rb @@ -0,0 +1,18 @@ +class Management::ProposalsController < Management::BaseController + include HasOrders + + has_orders %w{hot_score confidence_score created_at most_commented random}, only: :index + + def index + @proposals = Proposal.all.limit(10).page(params[:page]) + @tag_cloud = [] + set_proposal_votes(@proposals) + end + + private + + def set_proposal_votes(proposals) + @proposal_votes = current_user ? current_user.proposal_votes(proposals) : {} + end + +end \ No newline at end of file diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index 1c72fedbf..a8711e5d7 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -1,7 +1,7 @@ module AdminHelper def side_menu - render "/#{namespace}/menu" + #render "/#{namespace}/menu" end def official_level_options diff --git a/app/views/management/proposals/index.html.erb b/app/views/management/proposals/index.html.erb new file mode 100644 index 000000000..7c02f6d29 --- /dev/null +++ b/app/views/management/proposals/index.html.erb @@ -0,0 +1 @@ +<%= render template: "proposals/index" %> \ No newline at end of file diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index 28807d247..c0bbdc009 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -44,7 +44,7 @@ <%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button radius expand' %> - <%= render @proposals %> + <%= render partial: 'proposals/proposal', collection: @proposals %> <%= paginate @proposals %> diff --git a/config/routes.rb b/config/routes.rb index 391bc5415..3c23d5b5d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -169,6 +169,7 @@ Rails.application.routes.draw do get 'sign_in', to: 'sessions#create' resources :sessions, only: :create + resources :proposals, only: :index end # Example of regular route: