@@ -2,7 +2,7 @@ = OpenWFEru "ruote-web2" - CHANGELOG.txt -== ruote-web2 - 0.9.20 not yet released +== ruote-web2 - 0.9.21 not yet released - todo #23886 : added wfname and wfrevision to DbHistory - todo #23697 : using rake gems:install for rufus gems from now on CHANGELOG.txt @@ -63,7 +63,7 @@ class ErrorsController < ApplicationController def destroy e = OpenWFE::Extras::ProcessError.find_by_wfid_and_expid( - params[:wfid], swapdots(params[:expid])) + params[:wfid], OpenWFE.to_dots(params[:expid])) return error_reply( "no error at /errors/#{params[:wfid]}/#{params[:expid]}", 404 app/controllers/errors_controller.rb @@ -107,7 +107,7 @@ class ExpressionsController < ApplicationController def find_expression wfid = params[:wfid] - expid = swapdots(params[:expid]) + expid = OpenWFE.to_dots(params[:expid]) @process = ruote_engine.process_status(params[:wfid]) app/controllers/expressions_controller.rb @@ -130,7 +130,7 @@ class WorkitemsController < ApplicationController wi1 = parse_workitem - wid = "#{owi.fei.wfid}/#{swapdots(owi.fei.expid)}" + wid = "#{owi.fei.wfid}/#{OpenWFE.to_uscores(owi.fei.expid)}" if store_name = params[:store_name] @@ -184,7 +184,7 @@ class WorkitemsController < ApplicationController def find_workitem workitem = OpenWFE::Extras::ArWorkitem.find_by_wfid_and_expid( - params[:wfid], swapdots(params[:expid])) + params[:wfid], OpenWFE.to_dots(params[:expid])) current_user.may_see?(workitem) ? workitem : nil end app/controllers/workitems_controller.rb @@ -114,7 +114,7 @@ class ActionController::Routing::RouteSet::Mapper end def #{singular}_path (o) o = o.fei if o.is_a?(OpenWFE::FlowExpression) - "/#{plural}/\#{o.wfid}/\#{swapdots(o.expid)}" + "/#{plural}/\#{o.wfid}/\#{OpenWFE.to_uscores(o.expid)}" end def edit_#{singular}_path (o) "\#{#{singular}_path(o)}/edit" @@ -136,20 +136,6 @@ class ActionController::Routing::RouteSet::Mapper end # -# '.' <-> '_' -# -def swapdots (s) - (s.index('.') != nil) ? s.gsub(/\./, '_') : s.gsub(/_/, '.') -end - -# -# '_' --> '.' -# -def swap_to_dots (s) - (s.index('.') != nil) ? s : s.gsub(/_/, '.') -end - -# # adding Links to models' to_xml / to_json # module LinksMixin lib/ruote_routing.rb @@ -166,7 +166,7 @@ class WorkitemsControllerTest < ActionController::TestCase put( :update, { :wfid => wfei['workflow_instance_id'], - :expid => swapdots(wfei['expression_id']), + :expid => OpenWFE.to_uscores(wfei['expression_id']), 'state' => 'proceeded', 'fields' => atts }) test/functional/workitems_controller_test.rb ad163f2b1c87ff5ad63674c9bd306f865454152f John Mettraux jmettraux@gmail.com http://github.com/jmettraux/ruote-web2/commit/bd21d7714910af68d3ec2f0a82d1b8df6117fb0d bd21d7714910af68d3ec2f0a82d1b8df6117fb0d 2009-04-02T00:48:15-07:00 2009-04-02T00:48:15-07:00 deprecated swapdots cf65e2566d1e2704c82450c7500fc3df8f7f3b07 John Mettraux jmettraux@gmail.com