[Logilogi-svn] SF.net SVN: logilogi:[1569] trunk/app

Revision: 1569
          http://logilogi.svn.sourceforge.net/logilogi/?rev=1569&view=rev
Author:   wybow
Date:     2009-09-06 14:04:49 +0000 (Sun, 06 Sep 2009)

Log Message:
-----------
Fixed add commenting logi below bug

Modified Paths:
--------------
    trunk/app/controllers/application_controller.rb
    trunk/app/controllers/comments_controller.rb
    trunk/app/views/comments/_new.html.erb

Modified: trunk/app/controllers/application_controller.rb
===================================================================
--- trunk/app/controllers/application_controller.rb	2009-09-06 13:19:28 UTC (rev 1568)
+++ trunk/app/controllers/application_controller.rb	2009-09-06 14:04:49 UTC (rev 1569)
@@ -427,7 +427,13 @@
 
   def tag_with_link(logi, link_string)
     if link_string.empty?
-      logi.untag
+      if logi.comments_on_logis.empty?
+        # TODO fix better
+        logi.errors.add(:tags, 'should not be empty if it is not a replying' +
+            ' logi')
+      else
+        logi.untag
+      end
       return
     end
 

Modified: trunk/app/controllers/comments_controller.rb
===================================================================
--- trunk/app/controllers/comments_controller.rb	2009-09-06 13:19:28 UTC (rev 1568)
+++ trunk/app/controllers/comments_controller.rb	2009-09-06 14:04:49 UTC (rev 1569)
@@ -26,9 +26,9 @@
 
   def new
     @selected = params[:selected] || 'new_logi'
-    @logi = Logi.new_with(:creator => current_user,
+    @commenting_logi = Logi.new_with(:creator => current_user,
         :user_group => current_prefs.user_group)
-    @logi_version = @logi.current_logi_version
+    @commenting_logi_version = @commenting_logi.current_logi_version
     render :partial => 'new.html.erb', :locals => {
         :selected => @selected}
   end

Modified: trunk/app/views/comments/_new.html.erb
===================================================================
--- trunk/app/views/comments/_new.html.erb	2009-09-06 13:19:28 UTC (rev 1568)
+++ trunk/app/views/comments/_new.html.erb	2009-09-06 14:04:49 UTC (rev 1569)
@@ -10,7 +10,7 @@
       :selected => selected, :id => "new_comment", :update_selected => true} do %>
 <% end %>
 
-<% thorny_form_for(@logi, :url => logi_comments_path(:force => true),
+<% thorny_form_for(@commenting_logi, :url => logi_comments_path(:force => true),
       :method => :post, :html => {:id => "logi_form"}) do |form| %>
 
   <% if selected == "new_logi" %>
@@ -18,7 +18,7 @@
     <%= show_errors 'logi_version','logi' %>
 
     <%= render :partial => 'logis/edit', :locals => {
-        :name => 'logi', :logi_version => @logi_version} %>
+        :name => 'logi', :logi_version => @commenting_logi_version} %>
   <% else %>
     <% render :layout => 'application/panel', :locals => {:id => 'link_perma_id'} do %>
       <label id="perma_link_label">Permanent Link</label>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.