adminpanel 2.2.5 → 2.3.0

data/app/controllers/adminpanel/categories_controller.rb

@@ -1,86 +1,52 @@
 module Adminpanel
-  class CategoriesController < ApplicationController
+  class CategoriesController < Adminpanel::ApplicationController
+    skip_before_action :set_resource_collection
 
     def index
       @categories = Category.all
     end
 
     def new
-      set_collections
-      new! do |format|
-        format.html { render "shared/new" }
-        format.js do
-          render
-        end
+      @resource_instance = @model.new
+      respond_to do |format|
+        format.html { render 'adminpanel/shared/new' }
+        format.js { render }
       end
     end
 
-
     def create
       merge_params
-      create! do |success, failure|
-        success.html do
-          flash[:success] = I18n.t("action.save_success")
-          redirect_to categories_path
-        end
-        failure.html do
-          set_collections
-          render 'shared/new'
-        end
-        success.js do
-          if params[:currentcontroller].to_s == 'adminpanel/categories'
-            render 'create', :locals => {:category => resource}
-          elsif params[:belongs_request].present?
-            render 'shared/create_belongs_to'
-          else
-            render 'shared/create_has_many'
+      @resource_instance = @model.new(send(whitelisted_params))
+      respond_to do |format|
+        if @resource_instance.save
+          format.html { redirect_to categories_path, flash: { success: I18n.t('action.save_success') } }
+          format.js do
+            if params[:currentcontroller].to_s == 'adminpanel/categories'
+              # we are in categories controller
+              render 'create', locals: { category: @resource_instance }
+            elsif params[:belongs_request].present?
+              # we are in other controller as a belongs_to, add option to select
+              render 'adminpanel/shared/create_belongs_to', locals: { resource: @resource_instance }
+            else
+              # we are in other controller as a has_many, add checkbox
+              render 'adminpanel/shared/create_has_many', locals: { resource: @resource_instance }
+            end
           end
-        end
-        failure.js do
-          set_collections
-          render "new"
-
-        end
-      end
-    end
-
-    def edit
-      edit! do |format|
-        format.html do
-          set_collections
-          render "shared/edit"
-        end
-      end
-    end
-
-    def update
-      update! do |success, failure|
-        success.html do
-          flash[:success] = I18n.t("action.save_success")
-          # render "shared/index"
-          redirect_to categories_path
-        end
-        failure.html do
-          set_collections
-          render "shared/edit"
+        else
+          format.html { render 'adminpanel/shared/new' }
+          format.js { render 'new' }
         end
       end
     end
 
     def destroy
-      destroy! do |format|
-        format.html do
-          redirect_to categories_path
-        end
-      end
+      @resource_instance.destroy
+      redirect_to categories_path
     end
 
     private
       def category_params
         params.require(:category).permit(:name, :model)
-        # permitted.permit(:currentcontroller)
-        # params.require(:currentcontroller)
-
       end
   end
 end

data/app/controllers/adminpanel/permissions_controller.rb

@@ -4,8 +4,7 @@ module Adminpanel
     private
       def permission_params
         params.require(:permission).permit(
-
-          :rol_id,
+          :role_id,
           :action,
           :resource
         )

data/app/controllers/adminpanel/roles_controller.rb

@@ -0,0 +1,10 @@
+module Adminpanel
+  class RolesController < Adminpanel::ApplicationController
+
+    private
+    def role_params
+      params.require(:role).permit(:name, {permission_ids: []})
+
+    end
+  end
+end

data/app/controllers/adminpanel/sections_controller.rb

@@ -1,5 +1,9 @@
 module Adminpanel
   class SectionsController < Adminpanel::ApplicationController
+    def index
+      @sections = Section.all
+    end
+
     # def new
     #   @section = Section.new
     #   authorize! :create, @section
@@ -16,8 +20,8 @@ module Adminpanel
     def update
       @section = Section.find(params[:id])
 
-      if @section.update_attributes(params[:section])
-        redirect_to section_path(@section), :notice => 'La seccion se ha actualizado'
+      if @section.update(section_params)
+        redirect_to section_path(@section), notice: 'La seccion se ha actualizado'
       else
         render 'edit'
       end
@@ -27,17 +31,6 @@ module Adminpanel
       @section = Section.find(params[:id])
     end
 
-    # def destroy
-    #   @section = Section.find(params[:id])
-    #   @section.destroy
-
-    #   redirect_to sections_path
-    # end
-
-    def index
-      @sections = Section.all
-    end
-
     private
     def section_params
       params.require(:section).permit(
@@ -46,8 +39,15 @@ module Adminpanel
         :key,
         :page,
         :name,
+        :max_files,
         :has_image,
-        { images_attributes: [:id, :file, :_destroy] }
+        {
+          sectionfiles_attributes: [
+            :id,
+            :file,
+            :_destroy
+          ]
+        }
       )
     end
   end

data/app/controllers/adminpanel/sessions_controller.rb

@@ -4,7 +4,7 @@ module Adminpanel
     include ApplicationHelper
 
     protect_from_forgery
-    layout 'admin-login'
+    layout 'adminpanel/application-login'
     before_action :configure_instagram, only:[:instagram_login, :instagram_callback]
 
     def new
@@ -15,7 +15,7 @@ module Adminpanel
       if user && user.authenticate(params[:session][:password])
         sign_in user
         flash[:success] = I18n.t('authentication.signin_success')
-        permission = user.rol.permissions.first
+        permission = user.role.permissions.first
         if permission.nil?
           redirect_to root_url
         else
@@ -34,12 +34,13 @@ module Adminpanel
 
     def twitter_callback
       save_twitter_tokens
+      Rails.cache.clear
       flash[:success] = I18n.t('twitter.saved_token')
       redirect_to twitter_analytics_path
     end
 
     def instagram_login
-      redirect_to Instagram.authorize_url(:redirect_uri => instagram_callback_sessions_url, :scope => 'comments')
+      redirect_to Instagram.authorize_url(redirect_uri: instagram_callback_sessions_url, scope: 'comments')
     end
 
     def instagram_callback

data/app/controllers/adminpanel/users_controller.rb

@@ -1,6 +1,6 @@
 module Adminpanel
   class UsersController < Adminpanel::ApplicationController
-    
+
   private
     def user_params
       params.require(:user).permit(
@@ -8,7 +8,7 @@ module Adminpanel
         :name,
         :password,
         :password_confirmation,
-        :rol_id
+        :role_id
       )
     end
   end

data/app/controllers/concerns/adminpanel/analytics/twitter_analytics.rb

@@ -4,7 +4,7 @@ module Adminpanel
       extend ActiveSupport::Concern
 
       included do
-        before_filter :get_twitter_token, only:[:twitter, :reply_to_tweet, :favorite_tweet, :retweet_tweet]
+        before_action :get_twitter_token, only:[:twitter, :reply_to_tweet, :favorite_tweet, :retweet_tweet]
       end
 
       def reply_to_tweet

data/app/controllers/concerns/adminpanel/facebook_actions.rb

@@ -3,7 +3,7 @@ module Adminpanel
     extend ActiveSupport::Concern
 
     included do
-      before_filter :set_fb_auths_count, only:[:index, :create, :update, :destroy, :show]
+      before_action :set_fb_auths_count, only: [:index, :create, :update, :destroy, :show]
     end
 
     def fb_choose_page
@@ -13,7 +13,7 @@ module Adminpanel
         url_for({
           controller: params[:controller],
           action: :fb_choose_page,
-          id: resource,
+          id: @resource_instance,
           host: request.host
         })
       ).get_access_token(params[:code])
@@ -21,7 +21,7 @@ module Adminpanel
       @pages = user.get_connections('me', 'accounts')
       @name = user.get_object('me')['name']
       @pages << { 'name' => @name, 'access_token' => access_token } # to permit posts on own wall
-      render 'shared/fb_choose_page'
+      render 'adminpanel/shared/fb_choose_page'
     end
 
     def fb_save_token
@@ -30,32 +30,33 @@ module Adminpanel
       )
       update_fb_auth(page_selected.get_object('me')['name'])
       flash[:success] = I18n.t('fb.saved_token')
-      redirect_to resource
+      Rails.cache.clear
+      redirect_to @resource_instance
     end
 
     def fb_publish
-      authorize! :publish, resource
+      authorize! :publish, @resource_instance
 
       page_graph = Koala::Facebook::API.new(Auth.find_by_key('facebook').value)
       page_graph.put_wall_post(
         params[model_name][:fb_message],
         {
-          link: resource.share_link,
-          name: resource.name
+          link: @resource_instance.share_link,
+          name: @resource_instance.name
         }
       )
       flash[:success] = I18n.t('fb.posted', user: page_graph.get_object('me')['name'])
-      redirect_to resource
+      redirect_to @resource_instance
     end
 
   private
     def set_fb_auths_count
-      @fb_auths_count = Auth.where(key: 'facebook').count
+      @fb_auths_count ||= Auth.find_by_key('facebook')
     end
 
     def update_fb_auth(account_selected_name)
-      auths = Auth.where(key: 'facebook', name: account_selected_name)
-      if auths.count == 0
+      auth = Auth.find_by(key: 'facebook', name: account_selected_name)
+      if auth.nil?
         Auth.create(
           key: 'facebook',
           name: account_selected_name,
@@ -63,7 +64,7 @@ module Adminpanel
         )
       else
         #only support 1 fb account
-        auths.first.update_attribute(:value, params[model_name][:fb_page_access_key])
+        auth.update_attribute(:value, params[model_name][:fb_page_access_key])
       end
     end
 

data/app/controllers/concerns/adminpanel/galleryzable_actions.rb

@@ -2,16 +2,20 @@ module Adminpanel
   module GalleryzableActions
     extend ActiveSupport::Concern
 
-    def move_better
-      resource = @model.find(params[:id])
-      resource.move_to_better_position
+    included do
+      skip_authorize_resource :move_gallery_better, :move_gallery_worst
+    end
+
+    def move_gallery_better
+      @resource_instance = @model.find(params[:id])
+      @resource_instance.move_to_better_position
       respond
 
     end
 
-    def move_worst
-      resource = @model.find(params[:id])
-      resource.move_to_worst_position
+    def move_gallery_worst
+      @resource_instance = @model.find(params[:id])
+      @resource_instance.move_to_worst_position
       respond
     end
 
@@ -19,9 +23,9 @@ module Adminpanel
     def respond
       respond_to do |format|
         format.js do
-          render 'shared/gallery_entries', :locals => {
-            :collection => @model.where(
-              @model.relation_field.to_sym => resource.send(@model.relation_field)
+          render 'adminpanel/shared/gallery_entries', locals: {
+            collection: @model.ordered.where(
+              @model.relation_field.to_sym => @resource_instance.send(@model.relation_field)
             )
           }
         end

data/app/controllers/concerns/adminpanel/rest_actions.rb

@@ -1,85 +1,79 @@
 module Adminpanel
   module RestActions
+    extend ActiveSupport::Concern
+    included do
+      before_action :set_resource_instance,         only: [
+                                                          :show,
+                                                          :edit,
+                                                          :update,
+                                                          :destroy,
+                                                          :fb_choose_page,
+                                                          :fb_save_token,
+                                                          :fb_publish,
+                                                          :twitter_publish,
+                                                          :move_to_better,
+                                                          :move_to_worst
+                                                    ]
+      before_action :set_resource_collection,       only: [:index, :destroy]
+      before_action :set_relationship_collections,  only: [:new, :create, :edit, :update]
+    end
 
     def index
-      index! do |format|
-        format.html { render 'shared/index' }
-      end
+      render 'adminpanel/shared/index'
     end
 
     def show
-      show! do |format|
-        format.html { render 'shared/show' }
-      end
+      render 'adminpanel/shared/show' if stale?(last_modified: @resource_instance.updated_at.utc, etag: @resource_instance.cache_key)
     end
 
     def new
-      set_collections
-      new! do |format|
-        format.html { render 'shared/new' }
-        format.js { render 'shared/new', :locals => { :resource => resource }}
+      @resource_instance = @model.new
+      respond_to do |format|
+        render_new(format)
       end
     end
 
     def create
       merge_params
-      create! do |success, failure|
-        success.html do
-          flash[:success] = I18n.t('action.save_success')
-          redirect_to resource
-        end
-        failure.html do
-          set_collections
-          render 'shared/new'
-        end
-        success.js do
-          if params[:belongs_request]
-            render 'shared/create_belongs_to', :locals => { :resource => resource }
-          else
-            render 'shared/create_has_many', :locals => { :resource => resource }
+      @resource_instance = @model.new(send(whitelisted_params))
+      respond_to do |format|
+        if @resource_instance.save
+          format.html { redirect_to @resource_instance }
+          format.js do
+            # if format js, request is from another controller's form
+            if params[:belongs_request]
+              render 'adminpanel/shared/create_belongs_to', locals: { resource: @resource_instance }
+            else
+              render 'adminpanel/shared/create_has_many', locals: { resource: @resource_instance }
+            end
           end
+        else
+          render_new(format)
         end
-        failure.js do
-          set_collections
-          render 'shared/new', :locals => {:resource => resource }
-        end
-        respond_to_json(success, failure)
       end
     end
 
 
     def edit
-      edit! do |format|
-        format.html do
-          set_collections
-          render 'shared/edit'
-        end
-      end
+      render 'adminpanel/shared/edit'
     end
 
     def update
-      update! do |success, failure|
-        success.html do
-          flash.now[:success] = I18n.t('action.save_success')
-          render 'shared/index'
-        end
-        failure.html do
-          set_collections
-          render 'shared/edit'
-        end
-        respond_to_json(success, failure)
+      if @resource_instance.update(send(whitelisted_params))
+        redirect_to @resource_instance
+      else
+        render 'adminpanel/shared/edit'
       end
     end
 
     def destroy
-      destroy! do |format|
-        format.html { render 'shared/index' }
-      end
+      @resource_instance.destroy
+      redirect_to action: :index
     end
 
     private
 
-    def set_collections
+    def set_relationship_collections
       @collections = {}
       set_belongs_to_collections
       set_has_many_collections
@@ -106,20 +100,32 @@ module Adminpanel
     end
 
     def merge_params
-      params.merge({:model => params[:model]}) if params[:model].present?
-      params.merge({:model_name => params[:model_name]}) if params[:model_name].present?
-      params.merge({:belongs_request => params[:belongs_request]}) if params[:belongs_request].present?
-      params.merge({:currentcontroller => params[:currentcontroller]}) if params[:currentcontroller].present?
+      params.merge({model:             params[:model]})             if params[:model].present?
+      params.merge({model_name:        params[:model_name]})        if params[:model_name].present?
+      params.merge({belongs_request:   params[:belongs_request]})   if params[:belongs_request].present?
+      params.merge({currentcontroller: params[:currentcontroller]}) if params[:currentcontroller].present?
     end
 
-    def respond_to_json(success, failure)
-      success.json do
-        render json: resource
+    def whitelisted_params
+      resource = controller_name.singularize.to_sym
+      "#{resource}_params"
+    end
+
+    def set_resource_instance
+      @resource_instance = @model.find(params[:id])
+    end
+
+    def set_resource_collection
+      @collection = @model.all
+    end
+
+    def render_new format
+      format.html do
+        render 'adminpanel/shared/new'
       end
-      failure.json do
-        render json: resource
+      format.js do
+        render 'adminpanel/shared/new', locals: { resource: @resource_instance }
       end
     end
-
   end
 end