From bc505a13610b0a12a55c85ed0852c1448def7141 Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Sat, 12 Mar 2016 11:35:03 +1100
Subject: [PATCH] pundit: now updating maps actually works

---
 app/policies/map_policy.rb     |  1 -
 app/policies/mapping_policy.rb | 10 ++++------
 app/policies/synapse_policy.rb |  1 +
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/policies/map_policy.rb b/app/policies/map_policy.rb
index 5e845d44..50123877 100644
--- a/app/policies/map_policy.rb
+++ b/app/policies/map_policy.rb
@@ -35,7 +35,6 @@ class MapPolicy < ApplicationPolicy
 
   def update?
     user.present? && (record.permission == 'commons' || record.user == user)
-    true
   end
 
   def screenshot?
diff --git a/app/policies/mapping_policy.rb b/app/policies/mapping_policy.rb
index 13ef033e..787b5794 100644
--- a/app/policies/mapping_policy.rb
+++ b/app/policies/mapping_policy.rb
@@ -11,19 +11,17 @@ class MappingPolicy < ApplicationPolicy
   end
 
   def show?
-    map = policy(record.map, user)
-    mappable = policy(record.mappable, user)
+    map = Pundit.policy(user, record.map)
+    mappable = Pundit.policy(user, record.mappable)
     map.show? && mappable.show?
   end
 
   def create?
-    map = policy(record.map, user)
-    map.update?
+    Pundit.policy(user, record.map).update?
   end
 
   def update?
-    map = policy(record.map, user)
-    map.update?
+    Pundit.policy(user, record.map).update?
   end
 
   def destroy?
diff --git a/app/policies/synapse_policy.rb b/app/policies/synapse_policy.rb
index 85de12da..e8d49548 100644
--- a/app/policies/synapse_policy.rb
+++ b/app/policies/synapse_policy.rb
@@ -7,6 +7,7 @@ class SynapsePolicy < ApplicationPolicy
 
   def create?
     user.present?
+    # todo add validation against whether you can see both topics
   end
 
   def show?