diff --git a/app/controllers/bulk_update_requests_controller.rb b/app/controllers/bulk_update_requests_controller.rb
index c7b2ccbf9..58432780b 100644
--- a/app/controllers/bulk_update_requests_controller.rb
+++ b/app/controllers/bulk_update_requests_controller.rb
@@ -1,5 +1,5 @@
class BulkUpdateRequestsController < ApplicationController
- respond_to :html, :xml, :json
+ respond_to :html, :xml, :json, :js
before_filter :member_only
before_filter :admin_only, :only => [:approve]
before_filter :load_bulk_update_request, :except => [:new, :create, :index]
@@ -36,7 +36,7 @@ class BulkUpdateRequestsController < ApplicationController
def destroy
if @bulk_update_request.editable?(CurrentUser.user)
@bulk_update_request.reject!
- flash[:notice] = "Bulk update request deleted"
+ flash[:notice] = "Bulk update request rejected"
respond_with(@bulk_update_request, :location => bulk_update_requests_path)
else
access_denied()
diff --git a/app/models/bulk_update_request.rb b/app/models/bulk_update_request.rb
index 37c79661a..116704916 100644
--- a/app/models/bulk_update_request.rb
+++ b/app/models/bulk_update_request.rb
@@ -13,6 +13,7 @@ class BulkUpdateRequest < ActiveRecord::Base
attr_accessible :user_id, :forum_topic_id, :script, :title, :reason
attr_accessible :status, :as => [:admin]
before_validation :initialize_attributes, :on => :create
+ before_validation :normalize_text
after_create :create_forum_topic
module SearchMethods
@@ -114,4 +115,8 @@ class BulkUpdateRequest < ActiveRecord::Base
end
end
end
+
+ def normalize_text
+ self.script = script.downcase
+ end
end
diff --git a/app/views/bulk_update_requests/_listing.html.erb b/app/views/bulk_update_requests/_listing.html.erb
index 168664f9d..adf6a2781 100644
--- a/app/views/bulk_update_requests/_listing.html.erb
+++ b/app/views/bulk_update_requests/_listing.html.erb
@@ -14,13 +14,13 @@
<%= link_to_user(request.user) %> |
<%= link_to(request.forum_topic_id, forum_topic_path(request.forum_topic_id)) %> |
<%= script_with_line_breaks(request.script) %> |
- <%= request.status %> |
+ <%= request.status %> |
<% if CurrentUser.is_moderator? && request.status == "pending" %>
- <%= link_to "Approve", approve_bulk_update_request_path(request), :method => :post %> |
+ <%= link_to "Approve", approve_bulk_update_request_path(request), :remote => true, :method => :post %> |
<% end %>
<% if request.editable?(CurrentUser.user) %>
- <%= link_to "Delete", bulk_update_request_path(request), :method => :delete, :data => {:confirm => "Are you sure you want to delete this bulk update request?"} %> |
+ <%= link_to "Delete", bulk_update_request_path(request), :method => :delete, :remote => true, :data => {:confirm => "Are you sure you want to delete this bulk update request?"} %> |
<%= link_to "Edit", edit_bulk_update_request_path(request) %>
<% end %>
|
diff --git a/app/views/bulk_update_requests/approve.js.erb b/app/views/bulk_update_requests/approve.js.erb
new file mode 100644
index 000000000..01a0282bd
--- /dev/null
+++ b/app/views/bulk_update_requests/approve.js.erb
@@ -0,0 +1 @@
+$("#request-status-for-<%= @bulk_update_request.id %>").html("queued");
diff --git a/app/views/bulk_update_requests/destroy.js.erb b/app/views/bulk_update_requests/destroy.js.erb
new file mode 100644
index 000000000..f58670fb2
--- /dev/null
+++ b/app/views/bulk_update_requests/destroy.js.erb
@@ -0,0 +1 @@
+$("#request-status-for-<%= @bulk_update_request.id %>").html("rejected");
diff --git a/test/unit/bulk_update_request_test.rb b/test/unit/bulk_update_request_test.rb
index d176cf0d4..252ae5e8c 100644
--- a/test/unit/bulk_update_request_test.rb
+++ b/test/unit/bulk_update_request_test.rb
@@ -20,7 +20,11 @@ class BulkUpdateRequestTest < ActiveSupport::TestCase
setup do
@admin = FactoryGirl.create(:admin_user)
@topic = FactoryGirl.create(:forum_topic)
- @req = FactoryGirl.create(:bulk_update_request, :script => "create alias aaa -> bbb", :forum_topic => @topic)
+ @req = FactoryGirl.create(:bulk_update_request, :script => "create alias AAA -> BBB", :forum_topic => @topic)
+ end
+
+ should "downcase the text" do
+ assert_equal("create alias aaa -> bbb", @req.script)
end
should "update the topic when processed" do