incubator-olio-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sha...@apache.org
Subject svn commit: r814742 - in /incubator/olio/webapp/rails/trunk/app/controllers: events_controller.rb users_controller.rb
Date Mon, 14 Sep 2009 17:24:53 GMT
Author: shanti
Date: Mon Sep 14 17:24:53 2009
New Revision: 814742

URL: http://svn.apache.org/viewvc?rev=814742&view=rev
Log:
Fix for OLIO-98. Fixed as described in JIRA patch.

Modified:
    incubator/olio/webapp/rails/trunk/app/controllers/events_controller.rb
    incubator/olio/webapp/rails/trunk/app/controllers/users_controller.rb

Modified: incubator/olio/webapp/rails/trunk/app/controllers/events_controller.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/app/controllers/events_controller.rb?rev=814742&r1=814741&r2=814742&view=diff
==============================================================================
--- incubator/olio/webapp/rails/trunk/app/controllers/events_controller.rb (original)
+++ incubator/olio/webapp/rails/trunk/app/controllers/events_controller.rb Mon Sep 14 17:24:53
2009
@@ -353,11 +353,14 @@
   end
   
   def new_image?
-    return (params[:event_image] == '') ? false : true
+##    return (params[:event_image] == '') ? false : true
+# Fix for rails 2.3.2
+	return !(params[:event_image].blank?)
   end
   
   def new_document?
-    return (params[:event_document] == '') ? false : true
+#    return (params[:event_document] == '') ? false : true
+	return !(params[:event_document].blank?)
   end
 
   def attendee_list(event, max)

Modified: incubator/olio/webapp/rails/trunk/app/controllers/users_controller.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/app/controllers/users_controller.rb?rev=814742&r1=814741&r2=814742&view=diff
==============================================================================
--- incubator/olio/webapp/rails/trunk/app/controllers/users_controller.rb (original)
+++ incubator/olio/webapp/rails/trunk/app/controllers/users_controller.rb Mon Sep 14 17:24:53
2009
@@ -227,7 +227,9 @@
   private ###################################################
   
   def new_image?
-    return (params[:user_image] == '') ? false : true
+##    return (params[:user_image] == '') ? false : true
+# Fix for rails 2.3.2
+	return !(params[:user_image].blank?)
   end
   
   def invites_for_friend_links(user)



Mime
View raw message