Merge branch 'admin-public-holiday-interface' into rails-3-develop

1 files changed, 28 insertions, 0 deletions

diff --git a/app/controllers/admin_holiday_imports_controller.rb b/app/controllers/admin_holiday_imports_controller.rb
new file mode 100644
index 000000000..8596936f0
--- /dev/null
+++ b/app/controllers/admin_holiday_imports_controller.rb
@@ -0,0 +1,28 @@
+class AdminHolidayImportsController < AdminController
+
+    def new
+        @holiday_import = HolidayImport.new(holiday_import_params)
+        @holiday_import.populate if @holiday_import.valid?
+    end
+
+    def create
+        @holiday_import = HolidayImport.new(holiday_import_params)
+        if @holiday_import.save
+            notice = "Holidays successfully imported"
+            redirect_to admin_holidays_path, :notice => notice
+        else
+            render :new
+        end
+    end
+
+    private
+
+    def holiday_import_params(key = :holiday_import)
+        if params[key]
+            params[key].slice(:holidays_attributes, :start_year, :end_year, :source, :ical_feed_url)
+        else
+            {}
+        end
+    end
+
+end