[webui] support re-open of declined requests and also offer to use "r…

…evoke" directly on self-directed requests

src/webui/app/controllers/request_controller.rb

@@ -145,7 +145,7 @@ def changerequest
     end
 
     changestate = nil
-    ['accepted', 'declined', 'revoked'].each do |s|
+    ['accepted', 'declined', 'revoked', 'new'].each do |s|
       if params.has_key? s
         changestate = s
         break

src/webui/app/models/bs_request.rb

@@ -100,7 +100,7 @@ def modifyReview(id, changestate, opts)
 
     def modify(id, changestate, opts)
       opts = {:superseded_by => nil, :force => false, :reason => ''}.merge opts
-      if ["accepted", "declined", "revoked", "superseded"].include?(changestate)
+      if ["accepted", "declined", "revoked", "superseded", "new"].include?(changestate)
         transport ||= ActiveXML::Config::transport_for :bsrequest
         path = "/request/#{id}?newstate=#{changestate}&cmd=changestate"
         path += "&superseded_by=#{opts[:superseded_by]}" unless opts[:superseded_by].blank?

src/webui/app/views/request/show.html.erb

@@ -272,7 +272,11 @@
               <%= submit_tag "Accept request", :name => 'accepted' %>
             <% end %>
           <% end %>
-          <%= submit_tag "Decline request", :name => 'declined' %>
+          <% if @is_author %>
+            <%= submit_tag "Revoke request", :name => 'revoked' %>
+          <% else %>
+            <%= submit_tag "Decline request", :name => 'declined' %>
+          <% end %>
         <% elsif @is_author %>
           <%= submit_tag "Revoke request", :name => 'revoked' %>
         <% end %>