From 9e4a7b821fef94f4561bc99bc23bdabe12090411 Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Thu, 17 Dec 2015 09:34:49 +0800
Subject: [PATCH] cleanup topic model a bit

---
 app/models/topic.rb | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index f82bc256..8bac9606 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -39,27 +39,27 @@ class Topic < ActiveRecord::Base
   belongs_to :metacode
 
   def user_name
-    self.user.name
+    user.name
   end
 
   def user_image
-    self.user.image.url
+    user.image.url
   end
 
   def map_count
-    self.maps.count
+    maps.count
   end
 
   def synapse_count
-    self.synapses.count
+    synapses.count
   end
 
   def inmaps
-    self.maps.map(&:name)
+    maps.map(&:name)
   end
 
   def inmapsLinks
-    self.maps.map(&:id)
+    maps.map(&:id)
   end
 
   def as_json(options={})
@@ -71,24 +71,18 @@ class Topic < ActiveRecord::Base
   end
   
   def mk_permission
-    if self.permission == "commons"
-      "co"
-    elsif self.permission == "public"
-      "pu"
-    elsif self.permission == "private"
-      "pr"
-    end
+    Perm.short(permission)
   end
 
   # has no viewable synapses helper function
   def has_viewable_synapses(current)
   	result = false
-  	self.synapses.each do |synapse|
+  	synapses.each do |synapse|
   		if synapse.authorize_to_view(current)
   			result = true
   		end
   	end
-  	return result
+  	result
   end
   
   ##### PERMISSIONS ######