From 11d6d0b6d6e14adb4c89e7fff262a9a074db3aa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= <jjbazan@gmail.com>
Date: Thu, 18 Feb 2016 18:54:49 +0100
Subject: [PATCH] adds spending proposal show for valuator and admin

---
 app/controllers/spending_proposals_controller.rb | 5 +++++
 app/models/abilities/valuator.rb                 | 9 +++++++++
 app/models/ability.rb                            | 2 ++
 config/routes.rb                                 | 2 +-
 db/schema.rb                                     | 7 -------
 5 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 app/models/abilities/valuator.rb

diff --git a/app/controllers/spending_proposals_controller.rb b/app/controllers/spending_proposals_controller.rb
index 0ac839434..e82ad3eef 100644
--- a/app/controllers/spending_proposals_controller.rb
+++ b/app/controllers/spending_proposals_controller.rb
@@ -2,6 +2,7 @@ class SpendingProposalsController < ApplicationController
   include FeatureFlags
 
   before_action :authenticate_user!, except: [:index]
+  before_action :verify_valuator, only: [:show]
 
   load_and_authorize_resource
 
@@ -31,4 +32,8 @@ class SpendingProposalsController < ApplicationController
       params.require(:spending_proposal).permit(:title, :description, :external_url, :geozone_id, :terms_of_service, :captcha, :captcha_key)
     end
 
+    def verify_valuator
+      raise CanCan::AccessDenied unless current_user.try(:valuator?) || current_user.try(:administrator?)
+    end
+
 end
diff --git a/app/models/abilities/valuator.rb b/app/models/abilities/valuator.rb
new file mode 100644
index 000000000..edb542e4b
--- /dev/null
+++ b/app/models/abilities/valuator.rb
@@ -0,0 +1,9 @@
+module Abilities
+  class Valuator
+    include CanCan::Ability
+
+    def initialize(user)
+      can :manage, SpendingProposal
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 3d5c15d91..98ff4e55c 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -7,6 +7,8 @@ class Ability
     alias_action :hide_in_moderation_screen, to: :hide
 
     if user # logged-in users
+      self.merge Abilities::Valuator.new(user) if user.valuator?
+
       if user.administrator?
         self.merge Abilities::Administrator.new(user)
       elsif user.moderator?
diff --git a/config/routes.rb b/config/routes.rb
index c9e4023ad..6b2558951 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -69,7 +69,7 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :spending_proposals, only: [:index, :new, :create]
+  resources :spending_proposals, only: [:index, :new, :create, :show]
 
   resources :stats, only: [:index]
 
diff --git a/db/schema.rb b/db/schema.rb
index bbfaf7fa6..5b3a8831e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -415,12 +415,6 @@ ActiveRecord::Schema.define(version: 20160217101004) do
   add_index "users", ["hidden_at"], name: "index_users_on_hidden_at", using: :btree
   add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
 
-  create_table "validators", force: :cascade do |t|
-    t.integer "user_id"
-  end
-
-  add_index "validators", ["user_id"], name: "index_validators_on_user_id", using: :btree
-
   create_table "valuators", force: :cascade do |t|
     t.integer "user_id"
   end
@@ -496,6 +490,5 @@ ActiveRecord::Schema.define(version: 20160217101004) do
   add_foreign_key "moderators", "users"
   add_foreign_key "notifications", "users"
   add_foreign_key "organizations", "users"
-  add_foreign_key "validators", "users"
   add_foreign_key "valuators", "users"
 end