#community_dashboard - fixes

Francisco Marcelo de Araújo Lima Júnior
1 parent 7c4fa34c
Showing 4 changed files with 35 additions and 30 deletions Show diff stats
controllers/public/community_hub_plugin_public_controller.rb
lib/community_hub_plugin/mediation.rb
views/community_hub_plugin_public/_mediation.rhtml
views/community_hub_plugin_public/_post.rhtml
@@ -50,14 +50,12 @@ class CommunityHubPluginPublicController &lt; PublicController
         mediation_data = {}
         mediation_data.merge!(params[:article]) if params[:article]
-        mediation = TinyMceArticle.new(mediation_data)
+        mediation = CommunityHubPlugin::Mediation.new(mediation_data)
+        mediation.name = CommunityHubPlugin::Mediation.timestamp
         mediation.profile = profile
         mediation.last_changed_by = user
-        mediation.name = mediation_timestamp
-        mediation.notify_comments = false
-        mediation.type = 'TinyMceArticle'
-        mediation.advertise = false
         mediation.created_by_id = user.id
+        mediation.source = 'local'
         if mediation && mediation.save
           render :text => {'ok' => true}.to_json, :content_type => 'application/json'
@@ -113,7 +111,7 @@ class CommunityHubPluginPublicController &lt; PublicController
   def newer_articles
     latest_post = params[:latest_post]
     hub = Article.find(params[:hub])
-    posts = Article.find(:all, :order => "id desc", :conditions => ["id > :id and type = :type and parent_id = :hub", { :id => latest_post, :type => 'TinyMceArticle', :hub => hub.id }])
+    posts = CommunityHubPlugin::Mediation.find(:all, :order => "id desc", :conditions => ["id > :id and parent_id = :hub", { :id => latest_post, :hub => hub.id }])
     if !posts.empty?
       oldest_post = posts.last.id
@@ -158,11 +156,13 @@ class CommunityHubPluginPublicController &lt; PublicController
 	def pin_message
     if logged_in?
       if (!params[:hub].blank? && !params[:message].blank?)
+
         begin
           hub = Article.find(params[:hub])
         rescue
           hub = nil
         end
+
         if hub && hub.mediator?(user)
           begin
             message = Comment.find(params[:message])
@@ -171,42 +171,37 @@ class CommunityHubPluginPublicController &lt; PublicController
           end
           if message
-            mediation = TinyMceArticle.new
-            mediation.profile = hub.profile
-            mediation.parent = hub
-
             author = message.author.blank? ? user : message.author
+            mediation = CommunityHubPlugin::Mediation.new
+            mediation.name = CommunityHubPlugin::Mediation.timestamp
+
+            mediation.profile = hub.profile
             mediation.last_changed_by = author
             mediation.created_by_id = author.id
-
-            mediation.name = mediation_timestamp
             mediation.body = message.body
-            mediation.notify_comments = false
-            mediation.type = 'TinyMceArticle'
-            mediation.advertise = false
+            mediation.parent_id = hub.id
             mediation.source = 'local'
-            if mediation.save
+            if mediation && mediation.save
               if ( message.title == 'hub-message-twitter' )
                 mediation.source = 'twitter'
                 mediation.author_name = message.name
-                mediation.external_link = message.profile_picture
-              elsif ( message.title == 'hub-message-facebook' )
-                mediation.source = 'facebook'
-                mediation.author_name = message.name
+                mediation.profile_picture = message.profile_picture
+                mediation.save
               end
-              mediation.save
-
               hub.pinned_messages += [message.id] unless hub.pinned_messages.include?(message.id)
               hub.pinned_mediations += [mediation.id] unless hub.pinned_mediations.include?(mediation.id)
-              if hub.save
+
+              if hub && hub.save
                 render :text => {'ok' => true}.to_json, :content_type => 'application/json'
                 return true
               end
+
             end
+
           end
         end
       end
@@ -217,11 +212,6 @@ class CommunityHubPluginPublicController &lt; PublicController
 	protected
-  def mediation_timestamp
-    "hub-mediation-#{(Time.now.to_f * 1000).to_i}"
-  end
-
-
   def message_timestamp
     "hub-message-#{(Time.now.to_f * 1000).to_i}"
   end
@@ -0,0 +1,15 @@
+class CommunityHubPlugin::Mediation < Article
+
+  before_save do |mediation|
+    mediation.advertise = false
+    mediation.notify_comments = false
+    nil
+  end
+
+  settings_items :profile_picture, :type => :string, :default => ""
+
+  def self.timestamp
+    "hub-mediation-#{(Time.now.to_f * 1000).to_i}"
+  end
+
+end
@@ -7,7 +7,7 @@
     <li class="avatar">
       <% if mediation.source == 'twitter' %>
-        <%= image_tag(mediation.external_link, :alt => "Twitter") %>
+        <%= image_tag(mediation.profile_picture, :alt => "Twitter") %>
       <% elsif mediation.source == 'facebook' %>
         <%= image_tag('/plugins/community_hub/icons/logo_facebook_50x50.png', :alt => "Facebook") %>
       <% else %>
@@ -14,7 +14,7 @@
     </li>
     <li class="message"><span class="author"><%= post.author_name %>:</span> <%= post.body %></li>
-    <% if mediator?(hub) %>
+    <% if mediator?(hub) && post.title != 'hub-message-facebook' %>
     <li class="mediation-bar">
       <ul>
         <li class="pin">
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+class CommunityHubPlugin::Mediation < Article
	2	+
	3	+ before_save do \|mediation\|
	4	+ mediation.advertise = false
	5	+ mediation.notify_comments = false
	6	+ nil
	7	+ end
	8	+
	9	+ settings_items :profile_picture, :type => :string, :default => ""
	10	+
	11	+ def self.timestamp
	12	+ "hub-mediation-#{(Time.now.to_f * 1000).to_i}"
	13	+ end
	14	+
	15	+end
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7		7
8	<li class="avatar">	8	<li class="avatar">
9	<% if mediation.source == 'twitter' %>	9	<% if mediation.source == 'twitter' %>
10	- <%= image_tag(mediation.external_link, :alt => "Twitter") %>	10	+ <%= image_tag(mediation.profile_picture, :alt => "Twitter") %>
11	<% elsif mediation.source == 'facebook' %>	11	<% elsif mediation.source == 'facebook' %>
12	<%= image_tag('/plugins/community_hub/icons/logo_facebook_50x50.png', :alt => "Facebook") %>	12	<%= image_tag('/plugins/community_hub/icons/logo_facebook_50x50.png', :alt => "Facebook") %>
13	<% else %>	13	<% else %>
	@@ -14,7 +14,7 @@		@@ -14,7 +14,7 @@
14	</li>	14	</li>
15	<li class="message"><span class="author"><%= post.author_name %>:</span> <%= post.body %></li>	15	<li class="message"><span class="author"><%= post.author_name %>:</span> <%= post.body %></li>
16		16
17	- <% if mediator?(hub) %>	17	+ <% if mediator?(hub) && post.title != 'hub-message-facebook' %>
18	<li class="mediation-bar">	18	<li class="mediation-bar">
19	<ul>	19	<ul>
20	<li class="pin">	20	<li class="pin">