views/reply.erb @@ -4,6 +4,7 @@ == ruote-rest - 0.9.21 not yet released +- todo #25858 : reply page for things like "process x got cancelled" - todo #25710 : made workitem [payload] editable at error replay time - todo #25167 : integrated Gonzalo and Nando's newauth patch - bug #25016 : gem 'activerecord' getting in the way of frozen.rb. Removed. CHANGELOG.txt @@ -117,20 +117,25 @@ module RuoteRest "<div class=\"pager\">#{s}</div>" end - def render_ok (location, message) + # renders an information/message page + # + def render_reply (status, message) format, type = determine_out_format + response.status = status + if format == 'xml' - #response.status = 200 + "<message>#{message}</message>" + elsif format == 'json' - #response.status = 200 + message.to_json + else - response.status = 303 - response.location = request.href(:processes) - message + + _erb(:reply, :layout => :html, :locals => { :message => message }) end end lib/helpers/application.rb @@ -25,8 +25,7 @@ module RuoteRest -SERVICES = [ :processes, :workitems, :errors, :participants, :history ] - + SERVICES = [ :processes, :workitems, :errors, :participants, :history ] helpers do lib/rep/service.rb @@ -86,10 +86,11 @@ module RuoteRest RuoteRest.engine.replay_at_error(error) - render_ok(request.href(:errors), "error at #{error.href} replayed") + render_reply(200, "error at #{error.href} replayed") else - redirect(request.href(:errors)) + #render_reply(404, "no error found at #{error.href}") + render_reply(200, "no error found at #{error.href}") end end end lib/res/errors.rb @@ -32,13 +32,8 @@ module RuoteRest get '/expressions/:wfid' do - #wfid = params[:wfid] - #es = RuoteRest.engine.process_stack wfid, true - #throw :done, [ 404, "no process #{wfid}" ] unless es - ps = get_process_status - #rrender :expressions, es rrender :expressions, ps.all_expressions end @@ -48,7 +43,7 @@ module RuoteRest RuoteRest.engine.update_expression(e) - render_ok(e.href(request), "expression at #{e.href} updated") + render_reply(200, "expression at #{e.href} updated") end get '/expressions/:wfid/:expid' do @@ -68,7 +63,7 @@ module RuoteRest RuoteRest.engine.update_expression_tree(e, tree) - render_ok(e.href(request), "expression at #{e.href} updated") + render_reply(200, "expression at #{e.href} updated") end delete '/expressions/:wfid/:expid' do @@ -77,9 +72,7 @@ module RuoteRest RuoteRest.engine.cancel_expression e - render_ok( - request.href(:expressions, params[:wfid]), - "expression at #{e.href} cancelled (terminated)") + render_reply(200, "expression at #{e.href} cancelled (terminated)") end lib/res/expressions.rb @@ -47,9 +47,15 @@ module RuoteRest delete '/participants/:pid' do pid, part = get_participant - Participants.remove pid - render_ok(request.href(:participants), "participant #{pid} removed") + if pid + + Participants.remove(pid) + render_reply(200, "participant #{pid} removed") + else + + render_reply(200, "no participant '#{pid}' to remove") + end end lib/res/participants.rb @@ -130,11 +130,11 @@ module RuoteRest wfid = params[:wfid] - RuoteRest.engine.cancel_process wfid + RuoteRest.engine.cancel_process(wfid) sleep 0.350 - render_ok(request.href(:processes), "process #{wfid} deleted") + render_reply(200, "process #{wfid} deleted") end lib/res/processes.rb @@ -56,15 +56,14 @@ module RuoteRest RuoteRest.engine.reply(owi) wi.destroy - response.location = request.href(:workitems) - rrender(:workitems, find_workitems) + render_reply(200, "workitem at #{owi.href} proceeded") else # TODO : notify HTML clients of the update ? flash.notice ? wi.replace_fields(owi.attributes) - rrender(:workitem, wi) + render_reply(200, "workitem at #{owi.href} updated") end end @@ -78,8 +77,7 @@ module RuoteRest RuoteRest.engine.reply(wi) - response.location = request.href(:workitems) - rrender(:workitems, find_workitems) + render_reply(200, "workitem #{wi.fei.wfid} #{wi.fei.expid}proceeded") end # lib/res/workitems.rb @@ -9,7 +9,11 @@ body { .explanation { font-size: 12px; font-style: italic; - margin-bottom: 10px; + margin-bottom: 1em; +} +.message { + margin-top: 2em; + margin-bottom: 2em; } a, a:visited { color: #000099; public/css/application.css @@ -1,5 +1,5 @@ <div class="fei"> - <a href="/processes/<%= fei.wfid %>">GET /processes/<%= fei.wfid %></a> + <a href="/processes/<%= fei.wfid %>">GET /processes/<%= fei.wfid %></a> </div> views/fei.erb 5e4d8aaccf7254dbc9bddc4286c916100f8827ce John Mettraux jmettraux@gmail.com http://github.com/jmettraux/ruote-rest/commit/1f6da28aaf01cee61a11184c1f48078e9d7e83ad 1f6da28aaf01cee61a11184c1f48078e9d7e83ad 2009-05-10T04:20:02-07:00 2009-05-10T04:20:02-07:00 todo #25858 : reply page for things like "process x got cancelled" d4ca7553ed3dfe65476fbc3af89e78d5e5a60368 John Mettraux jmettraux@gmail.com