[myexperiment-hackers] [2625] trunk/app: Change in the way callback url is constructed.

[noreply]

Revision

2625

Author

dtm

Date

2011-07-05 05:10:54 -0400 (Tue, 05 Jul 2011)

Log Message

Change in the way callback url is constructed.

Modified Paths

• trunk/app/controllers/workflows_controller.rb
• trunk/app/helpers/application_helper.rb

Diff

Modified: trunk/app/controllers/workflows_controller.rb (2624 => 2625)

--- trunk/app/controllers/workflows_controller.rb	2011-07-04 16:07:58 UTC (rev 2624)
+++ trunk/app/controllers/workflows_controller.rb	2011-07-05 09:10:54 UTC (rev 2625)
@@ -649,7 +649,7 @@
 
   def store_callback
     if params[:callback]
-      session_object={ :url ="" URI.parse(params[:callback]), :label => 'Launch', :additional => 'externally', :format => 'xml' }
+      session_object={ :url ="" params[:callback], :label => 'Launch', :additional => 'externally', :format => 'xml' }
       if params[:callback_contenttypes]
         session_object[:types] =
             params[:callback_contenttypes].split(',').map {|x| x.to_i }

Modified: trunk/app/helpers/application_helper.rb (2624 => 2625)

--- trunk/app/helpers/application_helper.rb	2011-07-04 16:07:58 UTC (rev 2624)
+++ trunk/app/helpers/application_helper.rb	2011-07-05 09:10:54 UTC (rev 2625)
@@ -1570,7 +1570,7 @@
       end
     end
     if item_url
-      return session[:callback][:url].merge('?myexp_url='+URI.escape(item_url))
+      return session[:callback][:url]+URI.escape(item_url,'?!#&/')
     else
       return nil
     end