From 59de9b59c945dd6fdc5542e0409f073b31af9b48 Mon Sep 17 00:00:00 2001 From: Josh Adams Date: Thu, 25 Sep 2008 09:42:45 -0500 Subject: [PATCH] removed errant controllers from ansuz_user_manager plugin --- .../admin/page_plugins_controller.rb | 2 +- config/deploy.rb | 11 +++- .../app/controllers/articles_controller.rb | 23 -------- .../app/controllers/blog_posts_controller.rb | 56 ------------------- 4 files changed, 9 insertions(+), 83 deletions(-) delete mode 100644 vendor/plugins/ansuz_user_manager/app/controllers/articles_controller.rb delete mode 100644 vendor/plugins/ansuz_user_manager/app/controllers/blog_posts_controller.rb diff --git a/app/controllers/admin/page_plugins_controller.rb b/app/controllers/admin/page_plugins_controller.rb index 8339185..485309b 100644 --- a/app/controllers/admin/page_plugins_controller.rb +++ b/app/controllers/admin/page_plugins_controller.rb @@ -28,7 +28,7 @@ def edit def create if @page_plugin.save flash[:notice] = "Successfully saved the Page Plugin" - redirect_to admin_page_path(@page) + redirect_to edit_admin_page_path(@page) else flash.now[:error] = "There was a problem saving the Page Plugin" render :action => 'new' diff --git a/config/deploy.rb b/config/deploy.rb index 3975b25..a6fef46 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -19,15 +19,20 @@ role :db, "192.168.1.88", :primary => true task :sym_database_yml do - run "ln -s #{deploy_to}/current/config/database.yml.production #{deploy_to}/current/config/database.yml" + run "ln -s #{current_release}/config/database.yml.production #{current_release}/config/database.yml" end task :sym_files do - run "ln -s #{deploy_to}/shared/attached_files #{deploy_to}/current/public/attached_files" + run "ln -s #{deploy_to}/shared/attached_files #{current_release}/public/attached_files" + run "ln -s #{deploy_to}/shared/photo_album_photo_images #{current_release}/public/photo_album_photo_images" +end +task :run_plugin_migrations do + run "cd #{current_release}; export RAILS_ENV=production; rake db:migrate:plugins" end -task :after_deploy do +after "deploy:finalize_update" do sym_database_yml sym_files + run_plugin_migrations end namespace :host do diff --git a/vendor/plugins/ansuz_user_manager/app/controllers/articles_controller.rb b/vendor/plugins/ansuz_user_manager/app/controllers/articles_controller.rb deleted file mode 100644 index 8b0f441..0000000 --- a/vendor/plugins/ansuz_user_manager/app/controllers/articles_controller.rb +++ /dev/null @@ -1,23 +0,0 @@ -class ArticlesController < ApplicationController - unloadable # This is required if you subclass a controller provided by the base rails app - - layout 'page' - before_filter :load_blog_posts, :only => [:index] - before_filter :load_blog_post, :only => [:show] - - protected - def load_blog_posts - @blog_posts = Ansuz::JAdams::BlogPost.find(:all) - end - - def load_blog_post - @blog_post = Ansuz::JAdams::BlogPost.find(params[:id]) - end - - public - def index - end - - def show - end -end diff --git a/vendor/plugins/ansuz_user_manager/app/controllers/blog_posts_controller.rb b/vendor/plugins/ansuz_user_manager/app/controllers/blog_posts_controller.rb deleted file mode 100644 index 93453cc..0000000 --- a/vendor/plugins/ansuz_user_manager/app/controllers/blog_posts_controller.rb +++ /dev/null @@ -1,56 +0,0 @@ -class BlogPostsController < Admin::BaseController - unloadable # This is required if you subclass a controller provided by the base rails app - - layout 'admin' - before_filter :load_blog_post, :only => [:show, :edit, :update] - before_filter :load_new_blog_post, :only => [:new, :create] - before_filter :load_blog_posts, :only => [:index] - - protected - def load_blog_post - @blog_post = Ansuz::JAdams::BlogPost.find(params[:id]) - end - - def load_new_blog_post - @blog_post = Ansuz::JAdams::BlogPost.new(params[:blog_post]) - end - - def load_blog_posts - @blog_posts = Ansuz::JAdams::BlogPost.find(:all, :order => 'created_at DESC') - end - public - def new - end - - def create - if @blog_post.save - flash[:notice] = "Blog Post was created successfully." - redirect_to blog_posts_path - else - flash.now[:error] = "There was a problem creating the blog post." - render :action => 'new' - end - end - - def show - end - - def edit - end - - def update - if @blog_post.update_attributes(params[:blog_post]) - flash[:notice] = "Blog Post has been updated." - redirect_to blog_post_path(@blog_post) - else - flash.now[:error] = "There was a problem updating the Blog Post. Please try again." - render :action => 'edit' - end - end - - def destroy - @blog_post.destroy - flash[:notice] = "Blog post was deleted." - redirect_to blog_posts_path - end -end