Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2014-02-16 03:38:13 +00:00
commit 06a9dde2c2
2 changed files with 3 additions and 2 deletions

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
.idea
*~
*.swp
*/vendor/*
HTML
.DS_Store
coverage/

View File

@ -47,7 +47,7 @@ ActiveAdmin.register JamRuby::PromoBuzz, :as => 'Buzz' do
def create
promo = PromoBuzz.create_with_params(params[:jam_ruby_promo_buzz])
redirect_to('/admin/buzzs')
redirect_to admin_buzzs_path
end
def edit
@ -60,7 +60,7 @@ ActiveAdmin.register JamRuby::PromoBuzz, :as => 'Buzz' do
def update
resource.update_with_params(params[:jam_ruby_promo_buzz]).save!
redirect_to('/admin/buzzs')
redirect_to admin_buzzs_path
end
end