gluttonberg-core 2.6.4 → 3.0.0

data/app/controllers/gluttonberg/admin/main_controller.rb

@@ -2,7 +2,9 @@ module Gluttonberg
   module Admin
     class MainController < Gluttonberg::Admin::BaseController
       unloadable
+      before_filter :authorizer_for_publish , :only => [:waiting_for_approval , :decline_content]
 
+      # Dashboad
       def index
         @categories_count = ActsAsTaggableOn::Tag.find_by_sql(%{
           select count(DISTINCT tags.id) as category_count
@@ -11,15 +13,14 @@ module Gluttonberg
         }).first.category_count
         @tags_counts =  ActsAsTaggableOn::Tag.count - @categories_count.to_i
 
-        if Blog.table_exists?
-          @blog = Blog.first
+        if Gluttonberg.constants.include?(:Blog)
+          @blog = Gluttonberg::Blog::Weblog.first
         end
 
-        if Comment.table_exists?
-          @comments = Comment.all_pending.where({:commentable_type => "Gluttonberg::Article" , :moderation_required => true }).order("created_at DESC").limit(5)
-          @article = Article.new
-          @article_localization = ArticleLocalization.new(:article => @article , :locale_id => Locale.first_default.id)
-          @blogs = Gluttonberg::Blog.all
+        if Gluttonberg.constants.include?(:Blog)
+          @comments = Gluttonberg::Blog::Comment.all_pending.where({:commentable_type => "Gluttonberg::Article" , :moderation_required => true }).order("created_at DESC").limit(5)
+          @article = Gluttonberg::Blog::Article.new
+          @blogs = Gluttonberg::Blog::Weblog.all
           @authors = User.all
         end
       end
@@ -27,6 +28,75 @@ module Gluttonberg
       def show
       end
 
+      # list of content which is waiting for approval
+      def waiting_for_approval
+      end
+
+      # decline content which is waiting for approval
+      def decline_content
+        version, status = find_version_and_update_status
+        if status
+          unless version.user.blank?
+            notify_user(version)
+          end
+          flash[:notice] = "You have declined this version, the contributor has been notified."
+        else
+          flash[:error] = "The version was failed to decline."
+        end
+        redirect_to :back
+      end
+
+      private
+        def authorizer_for_publish
+          authorize! :publish, :any
+        end
+
+        def find_version_and_update_status
+          make_sure_localized_classes_are_loaded
+          status = false
+          version = params[:object_class].constantize::Version.where(:id => params[:version_id]).first
+          unless version.blank?
+            if version.version_status == 'submitted_for_approval'
+              version.version_status = 'declined'
+              status = version.save
+            end
+          end
+          return version, status
+        end
+
+        def notify_user(version)
+          title = if Gluttonberg::Content::actual_content_classes.map{|obj| obj.name}.include?(params[:object_class])
+            find_page_object_and_title(version)
+          elsif params[:object_class] == "Gluttonberg::Blog::ArticleLocalization"
+            find_article_and_title(version)
+          else
+            find_custom_model_and_title(version) 
+          end
+          Notifier.version_declined(current_user, version, request.referer, title).deliver 
+        end
+
+        def find_page_object_and_title(version)
+          object_id = (version.respond_to?(:page_localization_id) ? version.page_localization_id : version.page_id)
+          object = Gluttonberg::PageLocalization.where(:id => object_id).first
+          object.name unless object.blank?
+        end
+
+        def find_article_and_title(version)
+          object = version.article_localization
+          object.title unless object.blank?
+        end
+
+        def find_custom_model_and_title(version)
+          object = version.send(params[:object_class].demodulize.underscore.to_sym)
+          object.title_or_name? unless object.blank?
+        end
+
+        def make_sure_localized_classes_are_loaded
+          if params[:object_class][-12..-1] == "Localization"
+            params[:object_class][0..-13].constantize
+          end
+        end
+
     end
   end
 end

data/app/controllers/gluttonberg/admin/membership/base_controller.rb

@@ -2,8 +2,9 @@ class Gluttonberg::Admin::Membership::BaseController < Gluttonberg::Admin::BaseC
   before_filter :is_members_enabled
   
   protected
+    # only allow access for members controllers if membership system is enbaled in initializer
     def is_members_enabled 
-      unless Gluttonberg::Member.enable_members == true
+      if Gluttonberg::Member.enable_members == false
         raise CanCan::AccessDenied
       end  
     end  

data/app/controllers/gluttonberg/admin/membership/groups_controller.rb

@@ -12,62 +12,56 @@ module Gluttonberg
         def index
           @groups = Group.all
         end
-  
+
         def new
           @group = Group.new
         end
-  
+
         def create
           @group = Group.new(params[:gluttonberg_group])
-          if @group.save
-            flash[:notice] = "Group created!"
-            redirect_to :action => :index
-          else
-            render :action => :new
-          end
+          generic_create(@group, {
+            :name => "group",
+            :success_path => admin_membership_groups_path
+          })
         end
-        
-        def edit          
+
+        def edit
         end
-  
+
         def update
-          if @group.update_attributes(params[:gluttonberg_group])
-            flash[:notice] = "Member account updated!"
-            redirect_to  :action => :index
-          else
-            flash[:notice] = "Failed to save account changes!"
-            render :action => :edit
-          end 
+          @group.assign_attributes(params[:gluttonberg_group])
+          generic_update(@group, {
+            :name => "group",
+            :success_path => admin_membership_groups_path
+          })
         end
-        
+
         def delete
           display_delete_confirmation(
             :title      => "Delete “#{@group.name}” group?",
             :url        => admin_membership_group_path(@group),
-            :return_url => admin_membership_groups_path  
-          )        
+            :return_url => admin_membership_groups_path
+          )
         end
-  
+
         def destroy
-          if @group.destroy
-            flash[:notice] = "Group deleted!"
-            redirect_to :action => :index
-          else
-            flash[:error] = "There was an error deleting the group."
-            redirect_to :action => :index
-          end  
+          generic_destroy(@group, {
+            :name => "group",
+            :success_path => admin_groups_path,
+            :failure_path => admin_groups_path
+          })
         end
-  
+
        private
           def find_group
-            @group = Group.find(params[:id])
+            @group = Group.where(:id => params[:id]).first
             raise ActiveRecord::RecordNotFound  if @group.blank?
           end
-          
+
           def authorize_user
             authorize! :manage, Group
           end
-      
+
       end
     end
   end

data/app/controllers/gluttonberg/admin/membership/main_controller.rb

@@ -1,11 +1,12 @@
 
 module Gluttonberg
   module Admin
-    module Membership  
+    module Membership
           class MainController < Gluttonberg::Admin::Membership::BaseController
             def index
+              redirect_to admin_membership_members_path
             end
           end
-      end    
+      end
   end
 end

data/app/controllers/gluttonberg/admin/membership/members_controller.rb

@@ -10,17 +10,25 @@ module Gluttonberg
         include Gluttonberg::Public
 
         def index
+          @members = Member.order(get_order).includes(:groups)
           unless params[:query].blank?
             query = clean_public_query(params[:query])
-            command = "like"
-            if ActiveRecord::Base.configurations[Rails.env]["adapter"] == "postgresql"
-              command = "ilike"
-            end
-            @members = Member.order(get_order).where(["first_name #{command} ? OR last_name #{command} ? OR email #{command} ? OR bio #{command} ? " , "%#{query}%" , "%#{query}%" , "%#{query}%" , "%#{query}%" ]).includes(:groups)
-          else
-            @members = Member.order(get_order).includes(:groups)
+            command = Gluttonberg.like_or_ilike
+            @members = @members.where(["first_name #{command} :query OR last_name #{command} :query OR email #{command} :query OR bio #{command} :query " , :query => "%#{query}%" ])
+          end
+          @members = @members.paginate(:page => params[:page] , :per_page => Gluttonberg::Setting.get_setting("number_of_per_page_items") )
+        end
+
+        def group
+          @group = Group.where(:id => params[:id]).first
+          @members = @group.members.order(get_order).includes(:groups)
+          unless params[:query].blank?
+            query = clean_public_query(params[:query])
+            command = Gluttonberg.like_or_ilike
+            @members = @members.where(["first_name #{command} :query OR last_name #{command} :query OR email #{command} :query OR bio #{command} :query " , :query => "%#{query}%" ])
           end
           @members = @members.paginate(:page => params[:page] , :per_page => Gluttonberg::Setting.get_setting("number_of_per_page_items") )
+          render :template => "/gluttonberg/admin/membership/members/index"
         end
 
         def new
@@ -30,24 +38,16 @@ module Gluttonberg
         end
 
         def create
-          @password = Gluttonberg::Member.generateRandomString
-          password_hash = {
-              :password => @password ,
-              :password_confirmation => @password
-          }
+          password_hash = Gluttonberg::Member.generate_password_hash
 
           @member = Member.new(params[:gluttonberg_member].merge(password_hash))
-          if !params[:gluttonberg_member][:group_ids].blank? && params[:gluttonberg_member][:group_ids].kind_of?(String)
-            @member.group_ids = [params[:gluttonberg_member][:group_ids]]
-          else
-            @member.group_ids = params[:gluttonberg_member][:group_ids]
-          end
+          @member.assign_groups(params[:gluttonberg_member][:group_ids])
           @member.profile_confirmed = true
 
           if @member.save
-            flash[:notice] = "Member account registered and welcome email is also sent to the member"
+            flash[:notice] = "Member has been registered, A welcome email has been sent."
             MemberNotifier.welcome(@member.id).deliver
-            redirect_to :action => :index
+            redirect_to admin_membership_members_path
           else
             render :action => :new
           end
@@ -58,19 +58,12 @@ module Gluttonberg
         end
 
         def update
-          if params[:gluttonberg_member] && params[:gluttonberg_member]["image_delete"] == "1"
-            params[:gluttonberg_member][:image] = nil
-          end
-
-          if !params[:gluttonberg_member][:group_ids].blank? && params[:gluttonberg_member][:group_ids].kind_of?(String)
-            @member.group_ids = [params[:gluttonberg_member][:group_ids]]
-          else
-            @member.group_ids = params[:gluttonberg_member][:group_ids]
-          end
+          mark_image_delete
+          @member.assign_groups(params[:gluttonberg_member][:group_ids])
           @member.assign_attributes(params[:gluttonberg_member])
           if @member.save
             flash[:notice] = "Member account updated!"
-            redirect_to  :action => :index
+            redirect_to  admin_membership_members_path
           else
             flash[:notice] = "Failed to save account changes!"
             render :action => :edit
@@ -86,13 +79,11 @@ module Gluttonberg
         end
 
         def destroy
-          if @member.destroy
-            flash[:notice] = "Member deleted!"
-            redirect_to :action => :index
-          else
-            flash[:error] = "There was an error deleting the member."
-            redirect_to :action => :index
-          end
+          generic_destroy(@member, {
+            :name => "member",
+            :success_path => admin_membership_members_path,
+            :failure_path => admin_membership_members_path
+          })
         end
 
         def export
@@ -114,21 +105,19 @@ module Gluttonberg
             if @successfull.kind_of? String
               flash[:error] = @successfull
               redirect_to :action => new_bulk
-              return
             end
           end
         end
 
         def welcome
-           @member = Member.find(params[:id])
-           MemberNotifier.welcome( @member ).deliver
+           MemberNotifier.welcome( params[:id] ).deliver
            flash[:notice] = "Welcome email is successfully sent to the member."
-           redirect_to :action => :index
+           redirect_to admin_membership_members_path
         end
 
        private
           def find_member
-            @member = Member.find(params[:id])
+            @member = Member.where(:id => params[:id]).first
             raise ActiveRecord::RecordNotFound  if @member.blank?
           end
 
@@ -136,7 +125,13 @@ module Gluttonberg
             authorize! :manage, Member
           end
 
+          def mark_image_delete
+            if params[:gluttonberg_member] && params[:gluttonberg_member]["image_delete"] == "1"
+              params[:gluttonberg_member][:image] = nil
+            end
+          end
+
       end
     end
   end
-end
+end

data/app/controllers/gluttonberg/admin/password_resets_controller.rb

@@ -1,55 +1,43 @@
 module Gluttonberg
   module Admin
-    class PasswordResetsController < Gluttonberg::Admin::ApplicationController  
+    class PasswordResetsController < Gluttonberg::Admin::BaseController
       skip_before_filter :require_user
+      skip_before_filter :require_backend_access
       before_filter :load_user_using_perishable_token, :only => [:edit, :update]
-      
       layout 'bare'
-      
+
       def new
       end
-      
+
       def create
-        @user = User.find_by_email(params[:user][:email])
+        @user = User.where(:email => params[:user][:email]).first
         if @user
           @user.deliver_password_reset_instructions!
           flash[:notice] = "Instructions to reset your password have been emailed to you. " +
           "Please check your email."
-          redirect_to admin_root_path
+          redirect_to admin_login_path
         else
-          flash[:notice] = "No user was found with that email address"
-          redirect_to admin_root_path
+          flash[:error] = "No user was found with that email address"
+          redirect_to new_admin_password_reset_path
         end
       end
-      
+
       def edit
-        
+
       end
-      
+
       def update
         @user.password = params[:user][:password]
         @user.password_confirmation = params[:user][:password_confirmation]
-        if @user.save
-          flash[:notice] = "Password successfully updated"
-          redirect_to admin_root_path
-        else
-          render admin_root_path
-        end
+        generic_update_reset_password(@user, admin_login_path)
       end
-      
+
       private
-      
+
         def load_user_using_perishable_token
-          @user = User.find_using_perishable_token(params[:id])
-          unless @user
-            flash[:notice] = "We're sorry, but we could not locate your account. " +
-            "If you are having issues try copying and pasting the URL " +
-            "from your email into your browser or restarting the " +
-            "reset password process."
-            redirect_to admin_root_path
-          end
+          @user = generic_find_using_perishable_token(User)
         end
-    
+
     end
   end
 end

data/app/controllers/gluttonberg/admin/settings/configurations_controller.rb

@@ -0,0 +1,101 @@
+# encoding: utf-8
+
+module Gluttonberg
+  module  Admin
+    module Settings
+      class ConfigurationsController < Gluttonberg::Admin::BaseController
+        before_filter :find_setting, :only => [:delete, :edit, :update, :destroy]
+        before_filter :authorize_user
+        before_filter :authorize_user_for_create_or_destroy, :only => [:delete, :new, :create, :destroy]
+        record_history :@setting
+
+        # Confuguration/settings listing page
+        def index
+          # grab multisite settings
+          @multisite = Rails.configuration.multisite.kind_of?(Hash)
+          # grab all global settings
+          @cms_settings = Setting.where("site is NULL or site=''").order("row asc").all
+          # grab all settings for all sites
+          @site_wise_settings = {}
+          if @multisite
+            Rails.configuration.multisite.each do |key, val|
+              @site_wise_settings[key] = Setting.where(:site => key).order("row asc").all
+            end
+          end
+          @settings = Setting.order("row asc").all
+          @current_home_page_id  = Page.home_page.id unless Page.home_page.blank?
+          @pages = Page.all
+        end
+
+        def new
+          @setting = Setting.new
+        end
+
+        def edit
+        end
+
+        def create
+          @setting = Setting.new(params["gluttonberg_setting"])
+          count = Setting.all.length
+          @setting.row = count + 1
+          if @setting.save
+            flash[:notice] = "The configuration was successfully created."
+            redirect_to admin_configurations_path
+          else
+            render :new
+          end
+        end
+
+        def update
+          if params.has_key? "gluttonberg/setting"
+            params[:gluttonberg_setting] = params["gluttonberg/setting"]
+          end
+          if @setting.update_attributes(params[:gluttonberg_setting])
+            if request.xhr?
+              render :text => @setting.value
+            else
+              flash[:notice] = "The configuration was successfully updated."
+              format.html redirect_to admin_configurations_path
+            end
+          else
+            flash[:error] = "Sorry, The configuration could not be updated."
+            render :edit
+          end
+        end
+
+
+        def delete
+          display_delete_confirmation(
+            :title      => "Delete “#{@setting.name}” configuration?",
+            :url        => admin_configuration_path(@setting),
+            :return_url => admin_configurations_path
+          )
+        end
+
+        def destroy
+          generic_destroy(@setting, {
+            :name => "setting",
+            :success_path => admin_configurations_path,
+            :failure_path => admin_configurations_path
+          })
+        end
+
+        private
+
+          def find_setting
+            @setting = Setting.where(:id => params[:id]).first
+            raise ActiveRecord::RecordNotFound  unless @setting
+          end
+
+          def authorize_user
+            authorize! :manage, Gluttonberg::Setting
+          end
+
+          def authorize_user_for_create_or_destroy
+            authorize! :create_or_destroy, Gluttonberg::Setting
+          end
+
+      end # ConfigurationsController
+    end # Settings
+  end #admin
+end # Gluttonberg