keppler 2.0.2 → 2.0.3

data/installer/core/app/assets/stylesheets/vendor/admin-lte/_skin-blue.scss

@@ -57,7 +57,7 @@
   background: transparent;
 }
 .skin-blue .wrapper{
-  background-color: #ecf0f5;
+  background-color: #f5f5f5;
 }
 .skin-blue .main-sidebar,
 .skin-blue .left-side {

data/installer/core/app/controllers/admin/admin_controller.rb

@@ -65,7 +65,7 @@ module Admin
       klass = is_admin ? controller_name : controller_path
 
       redefine_ids(params[:multiple_ids]).each do |id|
-        authorize! :destroy, klass.classify.constantize.find(id)
+        authorize klass.classify.constantize.find(id)
       end
     end
   end

data/installer/core/app/controllers/admin/customizes_controller.rb

@@ -1,12 +1,10 @@
 module Admin
   # CustomizesController
   class CustomizesController < AdminController
-    before_action :set_customize, only: %i[show edit update destroy]
+    before_action :set_customize, only: %i[show edit update destroy authorization]
     before_action :set_customizes, only: %i[update install_default]
     before_action :show_history, only: %i[index]
-    before_action :authorization, only: %i[
-      new create edit update destroy destroy_multiple
-    ]
+    before_action :authorization, except: %i[reload install_default]
 
     # GET /customizes
     def index
@@ -43,7 +41,7 @@ module Admin
       @customizes.each { |customize| customize.update(installed: false) }
       if @customize.update(customize_params)
         @customize.installed? ? @customize.install : @customize.uninstall
-        redirect_to :back
+        redirect_to admin_customizes_path
       else
         render :edit
       end
@@ -52,12 +50,12 @@ module Admin
     def install_default
       @customize = Customize.find(params[:customize_id])
       if @customize.installed?
-        redirect_to :back
+        redirect_to admin_customizes_path
       else
         @customizes.each { |customize| customize.update(installed: false) }
         if @customize.update(customize_params)
           @customize.install_keppler_template
-          redirect_to :back
+          redirect_to admin_customizes_path
         else
           render :edit
         end
@@ -93,7 +91,7 @@ module Admin
     end
 
     def authorization
-      authorize @customize
+      authorize Customize
     end
 
     # Only allow a trusted parameter "white list" through.

data/installer/core/app/controllers/admin/meta_tags_controller.rb

@@ -1,18 +1,18 @@
 module Admin
   # MetaTagController
   class MetaTagsController < AdminController
-    before_action :set_meta_tag, only: [:show, :edit, :update, :destroy]
-    before_action :show_history, only: [:index]
+    before_action :set_meta_tag, only: %i[show edit update destroy]
+    before_action :show_history, only: %i[index]
+    before_action :authorization, except: %i[reload]
 
     # GET /meta_tags
     def index
       @q = MetaTag.ransack(params[:q])
-      meta_tags = @q.result(distinct: true).order(:position)
-      @objects = meta_tags.page(@current_page)
-      @total = meta_tags.size
-      if !@objects.first_page? && @objects.size.zero?
-        redirect_to meta_tags_path(page: @current_page.to_i.pred,search: @query)
-      end
+      @meta_tags = @q.result(distinct: true).order(:position)
+      @objects = @meta_tags.page(@current_page)
+      @total = @meta_tags.size
+      redirect_to_index(meta_tags_path) if nothing_in_first_page?(@objects)
+      respond_to_formats(@meta_tags)
     end
 
     # GET /meta_tags/1
@@ -22,12 +22,10 @@ module Admin
     # GET /meta_tags/new
     def new
       @meta_tag = MetaTag.new
-      authorize @meta_tag
     end
 
     # GET /meta_tags/1/edit
     def edit
-      authorize @meta_tag
     end
 
     # POST /meta_tags
@@ -47,7 +45,6 @@ module Admin
       else
         render :edit
       end
-      authorize @meta_tag
     end
 
     def clone
@@ -58,14 +55,12 @@ module Admin
       else
         render :new
       end
-      authorize @meta_tag
     end
 
     # DELETE /meta_tags/1
     def destroy
       @meta_tag.destroy
       redirect_to admin_meta_tags_path, notice: actions_messages(@meta_tag)
-      authorize @meta_tag
     end
 
     def destroy_multiple
@@ -74,16 +69,14 @@ module Admin
         admin_meta_tags_path(page: @current_page, search: @query),
         notice: actions_messages(MetaTag.new)
       )
-      authorize @meta_tag
     end
 
-    def import
-      MetaTag.import(params[:file])
+    def upload
+      MetaTag.upload(params[:file])
       redirect_to(
         admin_meta_tags_path(page: @current_page, search: @query),
         notice: actions_messages(MetaTag.new)
       )
-      authorize @meta_tag
     end
 
     def download
@@ -93,7 +86,6 @@ module Admin
         format.xls { send_data(@meta_tags.to_xls) }
         format.json { render :json => @meta_tags }
       end
-      authorize @meta_tags
     end
 
     def reload
@@ -107,6 +99,10 @@ module Admin
 
     private
 
+    def authorization
+      authorize MetaTag
+    end
+
     # Use callbacks to share common setup or constraints between actions.
     def set_meta_tag
       @meta_tag = MetaTag.find(params[:id])

data/installer/core/app/controllers/admin/roles_controller.rb

@@ -0,0 +1,176 @@
+module Admin
+  # RolesController
+  class RolesController < AdminController
+    before_action :set_role, only: %i[show edit update destroy toggle_actions create_first_permission]
+    before_action :set_role_id, only: %i[create_permissions add_permissions]
+    before_action :show_history, only: [:index]
+    before_action :set_attachments
+    before_action :authorization, except: %i[reload]
+
+    # GET /roles
+    def index
+      @q = Role.ransack(params[:q])
+      roles = @q.result(distinct: true)
+      @objects = roles.page(@current_page).order(position: :desc)
+      @total = roles.size
+      @roles = @objects.order(:position)
+      if !@objects.first_page? && @objects.size.zero?
+        redirect_to roles_path(page: @current_page.to_i.pred, search: @query)
+      end
+    end
+
+    # GET /roles/1
+    def show
+    end
+
+    # GET /roles/new
+    def new
+      @role = Role.new
+    end
+
+    # GET /roles/1/edit
+    def edit
+    end
+
+    # POST /roles
+    def create
+      @role = Role.new(role_params)
+
+      if @role.save
+        redirect_to admin_role_add_permissions_path(@role)
+      else
+        render :new
+      end
+    end
+
+    # PATCH/PUT /roles/1
+    def update
+      if @role.update(role_params)
+        redirect(@role, params)
+      else
+        render :edit
+      end
+    end
+
+    def clone
+      @role = Role.clone_record params[:role_id]
+      if @role.save
+        redirect_to admin_roles_path
+      else
+        render :new
+      end
+    end
+
+    # DELETE /roles/1
+    def destroy
+      @role.destroy
+      redirect_to admin_roles_path, notice: actions_messages(@role)
+    end
+
+    def destroy_multiple
+      Role.destroy redefine_ids(params[:multiple_ids])
+      redirect_to(
+        admin_roles_path(page: @current_page, search: @query),
+        notice: actions_messages(Role.new)
+      )
+    end
+
+    def upload
+      Role.upload(params[:file])
+      redirect_to(
+        admin_roles_path(page: @current_page, search: @query),
+        notice: actions_messages(Role.new)
+      )
+    end
+
+    def download
+      @roles = Role.all
+      respond_to do |format|
+        format.html
+        format.xls { send_data(@roles.to_xls) }
+        format.json { render :json => @roles }
+      end
+    end
+
+    def reload
+      @q = Role.ransack(params[:q])
+      roles = @q.result(distinct: true)
+      @objects = roles.page(@current_page).order(position: :desc)
+    end
+
+    def sort
+      Role.sorter(params[:row])
+      render :index
+    end
+
+    def add_permissions
+      @role = Role.find(params[:role_id])
+    end
+
+    def create_permissions
+      @module = params[:role][:module]
+      @action = params[:role][:action]
+
+      if @role.have_permissions?
+        toggle_actions(params[:role][:module], params[:role][:action])
+      else
+        create_first_permission
+      end
+      # redirect_to admin_role_add_permissions_path(params[:role_id])
+    end
+
+    def show_description
+      @module = params[:module]
+      @action = params[:action_name]
+    end
+
+    private
+
+    
+    def toggle_actions(module_name, action)
+      if @role.have_permission_to(module_name)
+        @role.toggle_action(module_name, action)
+      else
+        @role.add_module(module_name, action)
+      end
+    end
+
+    def create_first_permission
+      Permission.create(
+        role_id: @role.id,
+        modules: create_hash(params[:role][:module], params[:role][:action])
+      )
+    end
+
+    def create_hash(module_name, actions)
+      Hash[module_name, Hash["actions", Array(actions)]]
+    end
+
+    def set_attachments
+      @attachments = ['logo', 'brand', 'photo', 'avatar', 'cover', 'image',
+                      'picture', 'banner', 'attachment', 'pic', 'file']
+    end
+
+    # Use callbacks to share common setup or constraints between actions.
+    def set_role
+      @role = Role.find(params[:id])
+    end
+
+    def set_role_id
+      @role = Role.find(params[:role_id])
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def role_params
+      params.require(:role).permit(:name, :role_id)
+    end
+
+    def authorization
+      authorize Role
+    end
+
+    def show_history
+      get_history(Role)
+    end
+  end
+end

data/installer/core/app/controllers/admin/scripts_controller.rb

@@ -1,35 +1,30 @@
 module Admin
   # ScriptsController
   class ScriptsController < AdminController
-    before_action :set_ga_track, only: [:show, :edit, :update, :destroy]
-    before_action :show_history, only: [:index]
+    before_action :set_ga_track, only: %i[show edit update destroy]
+    before_action :show_history, only: %i[index]
+    before_action :authorization, except: %i[reload]
 
     # GET /scripts
     def index
       @q = Script.ransack(params[:q])
-      scripts = @q.result(distinct: true)
-      @objects = scripts.page(@current_page)
-      @total = scripts.size
-
-      if !@objects.first_page? && @objects.size.zero?
-        redirect_to scripts_path(page: @current_page.to_i.pred,search: @query)
-      end
+      @scripts = @q.result(distinct: true)
+      @objects = @scripts.page(@current_page)
+      @total = @scripts.size
+      redirect_to_index(scripts_path) if nothing_in_first_page?(@objects)
+      respond_to_formats(@scripts)
     end
 
     # GET /scripts/1
-    def show
-    end
+    def show; end
 
     # GET /scripts/new
     def new
       @script = Script.new
-      authorize @script
     end
 
     # GET /scripts/1/edit
-    def edit
-      authorize @script
-    end
+    def edit; end
 
     # POST /scripts
     def create
@@ -49,7 +44,6 @@ module Admin
       else
         render :edit
       end
-      authorize @script
     end
 
     def clone
@@ -60,7 +54,6 @@ module Admin
       else
         render :new
       end
-      authorize @script
     end
 
     # DELETE /scripts/1
@@ -71,12 +64,10 @@ module Admin
         admin_scripts_path,
         notice: actions_messages(@script)
       )
-      authorize @script
     end
 
     def destroy_multiple
       Script.destroy redefine_ids(params[:multiple_ids])
-
       redirect_to(
         admin_scripts_path(page: @current_page, search: @query),
         notice: actions_messages(Script.new)
@@ -84,23 +75,12 @@ module Admin
       authorize @script
     end
 
-    def import
-      Script.import(params[:file])
+    def upload
+      Script.upload(params[:file])
       redirect_to(
         admin_scripts_path(page: @current_page, search: @query),
         notice: actions_messages(Script.new)
       )
-      authorize @script
-    end
-
-    def download
-      @scripts = Script.all
-      respond_to do |format|
-        format.html
-        format.xls { send_data(@scripts.to_xls) }
-        format.json { render :json => @scripts }
-      end
-      authorize @scripts
     end
 
     def reload
@@ -110,13 +90,14 @@ module Admin
     end
 
     private
+
     # Use callbacks to share common setup or constraints between actions.
     def set_ga_track
       @script = Script.find(params[:id])
     end
 
     def authorization
-      authorize @script
+      authorize Script
     end
 
     # Only allow a trusted parameter "white list" through.