Merge remote-tracking branch 'origin/release/0.18'0.18

1 files changed, 27 insertions, 0 deletions

diff --git a/app/controllers/admin_spam_addresses_controller.rb b/app/controllers/admin_spam_addresses_controller.rb
new file mode 100644
index 000000000..f5c7e93da
--- /dev/null
+++ b/app/controllers/admin_spam_addresses_controller.rb
@@ -0,0 +1,27 @@
+class AdminSpamAddressesController < AdminController
+
+    def index
+        @spam_addresses = SpamAddress.all
+        @spam_address = SpamAddress.new
+    end
+
+    def create
+        @spam_address = SpamAddress.new(params[:spam_address])
+
+        if @spam_address.save
+            notice = "#{ @spam_address.email } has been added to the spam addresses list"
+            redirect_to spam_addresses_path, :notice => notice
+        else
+            @spam_addresses = SpamAddress.all
+            render :index
+        end
+    end
+
+    def destroy
+        @spam_address = SpamAddress.find(params[:id])
+        @spam_address.destroy
+        notice = "#{ @spam_address.email } has been removed from the spam addresses list"
+        redirect_to spam_addresses_path, :notice => notice
+    end
+
+end