rademade_admin 0.1.3 → 0.1.4

data/app/assets/stylesheets/rademade_admin/blocks/gallery/_main.sass

@@ -0,0 +1,67 @@
+.gallery
+  +clear
+  .gallery-images-container
+    overflow: auto
+    .gallery-image
+      display: inline-block
+      position: relative
+      padding: 5px
+  .gallery-image-upload
+    float: left
+    position: relative
+    width: 100%
+    height: 98px
+    padding: 96px 0 0
+    margin: 0 5px 5px 0
+    border: 1px dashed #BDC3C7
+    font-size: 300px
+    overflow: hidden
+    cursor: pointer
+    background-color: #ffffff
+    outline: none
+    +border-radius(3px)
+    +box-sizing(border-box)
+    &:hover
+      opacity: 0.6
+    &:after
+      position: absolute
+      top: 0
+      left: 0
+      padding-top: 45px
+      content: "Click or drop files here"
+      text-align: center
+      width: 100%
+      height: 100%
+      font-size: 15px
+      color: #555
+      +box-sizing(border-box)
+
+
+  .remove-ico
+    position: absolute
+    top: 2px
+    right: 5px
+    font-size: 13px
+    cursor: pointer
+    padding: 1px 5px
+    border-radius: 3px
+    background-color: #FFF
+    font-weight: bold
+
+  .crop-btn
+    position: absolute
+    bottom: 5px
+
+  .gallery-images-container
+    float: left
+    margin: 0 -2px
+    .gallery-image
+      float: left
+      margin: 0 2px 4px 2px
+      width: 135px
+      height: 98px
+      border: 1px solid #BDC3C7
+      +border-radius(3px)
+      img
+        max-width: 100% !important
+        max-height: 100% !important

data/app/assets/stylesheets/rademade_admin/modules/pagination/main.sass

@@ -9,8 +9,11 @@
     padding: 0 15px
   .last
     padding: 0 15px
-
-  span
+  .page,
+  .next,
+  .last,
+  .first,
+  .prev
     float: left
     margin: 0 -1px 0 0
     padding: 0
@@ -25,6 +28,20 @@
       border-bottom: 1px solid #34495e
       a
         color: #34495e
+
+    &.gap
+      display: inline-block
+      padding: 0 5px
+      min-width: 35px
+      height: 37px
+      line-height: 35px
+      font-size: 14px
+      color: #34495e
+      text-align: center
+      cursor: default
+      +box-sizing(border-box)
+      &:hover
+        border: 1px solid #dddddd
     a
       display: inline-block
       padding: 0 5px

data/app/cells/menu/item.slim

@@ -8,6 +8,8 @@
     a href="#{@uri}" class=('menu-link' + (@has_sub_items ? ' dropdown-toggle' : ''))
       i(class="#{@ico_class}")
       span #{@name}
+      - if @count && @count > 0
+        span()  (#{@count})
 
       - if @has_sub_items
         span.caret

data/app/cells/menu_cell.rb

@@ -2,12 +2,13 @@ class MenuCell < Cell::Rails
   include ::RademadeAdmin::UriHelper
 
   class << self
-    attr_accessor :current_model
+    attr_accessor :current_model, :current_ability
   end
 
   def root_item
     @uri = root_uri
     @name = t('rademade_admin.home')
+    @count = nil
     @ico_class = 'glyphicon glyphicon-home'
     @has_sub_items = false
     @is_active = self.class.current_model.nil?
@@ -33,8 +34,9 @@ class MenuCell < Cell::Rails
 
   def item_data(item)
     @is_active = current?(item) || children_current?(item) #todo extract service for current
-    @uri = admin_list_uri(item.model)
+    @uri = can_read?(item) ? admin_list_uri(item.model) : nil
     @name = item.name
+    @count = item.count
     @has_sub_items = item.has_sub_items?
     @sub_items = item.sub_items
   end
@@ -43,6 +45,10 @@ class MenuCell < Cell::Rails
     self.class.current_model == item.model
   end
 
+  def can_read?(item) # todo move authorize check to uri helper
+    self.class.current_ability.can?(:read, item.model)
+  end
+
   def children_current?(item, status = false)
     if item.has_sub_items?
       item.sub_items.each do |sub_item|

data/app/controllers/rademade_admin/abstract_controller.rb

@@ -7,7 +7,7 @@ module RademadeAdmin
 
     layout 'rademade_admin'
 
-    before_action :init_user, :init_template_service, :require_login, :root_breadcrumbs
+    before_action :init_user, :init_template_service, :require_login, :root_breadcrumbs, :menu
     
     attr_reader :current_user
 
@@ -41,7 +41,11 @@ module RademadeAdmin
     end
 
     def current_ability
-      @current_ability ||= ::RademadeAdmin::Ability.new(@current_user)
+      @current_ability ||= (RademadeAdmin.ability_class || ::RademadeAdmin::Ability).new(@current_user)
+    end
+
+    def menu
+      MenuCell.current_ability = current_ability
     end
 
   end

data/app/controllers/rademade_admin/dashboard_controller.rb

@@ -5,7 +5,7 @@ module RademadeAdmin
     skip_before_action :require_login, :only => [:login]
 
     def index
-
+      MenuCell.current_model = nil
     end
 
     def login

data/app/controllers/rademade_admin/file_controller.rb

@@ -9,11 +9,16 @@ class RademadeAdmin::FileController < RademadeAdmin::AbstractController
       :file => uploader
     }
   rescue CarrierWave::UploadError => e
-    render :json => { :error => e.to_s }, :status => :unprocessable_entity
+    show_error(e)
+  end
+
+  def download
+    # todo filename
+    send_file(uploader.model.send(uploader.mounted_as).file.file)
   end
 
   def crop
-    image = uploader.crop_image(params[:path], params[:crop])
+    image = uploader.crop_image(params[:crop], params[:path])
     uploader.store!(image)
     upload_preview_service = RademadeAdmin::Upload::PreviewService.new(uploader)
     render :json => {
@@ -21,18 +26,22 @@ class RademadeAdmin::FileController < RademadeAdmin::AbstractController
       :file => uploader
     }
   rescue CarrierWave::UploadError => e
-    render :json => { :error => e.to_s }, :status => :unprocessable_entity
+    show_error(e)
   end
 
   private
 
+  def show_error(error)
+    render :json => { :error => error.to_s }, :status => :unprocessable_entity
+  end
+
   def uploader
     @uploader ||= RademadeAdmin::LoaderService.const_get(params[:uploader]).new(model, params[:column])
   end
 
   def model
     model_class = RademadeAdmin::LoaderService.const_get(params[:model])
-    params[:saved].to_i.zero? ? model_class.new : model_class.find(params[:id])
+    params[:id].present? ? model_class.find(params[:id]) : model_class.new
   end
 
-end
+end

data/app/controllers/rademade_admin/gallery_controller.rb

@@ -0,0 +1,48 @@
+# -*- encoding : utf-8 -*-
+class RademadeAdmin::GalleryController < RademadeAdmin::AbstractController
+
+  def upload
+    gallery_service.upload_images(params[:gallery_id], params[:files])
+    render :json => {
+      :gallery_images_html => gallery_service.gallery_images_html
+    }
+  rescue Exception => e
+    show_error(e)
+  end
+
+  def crop
+    uploader = gallery_service.crop_image(params[:id], params[:crop])
+    preview_service = RademadeAdmin::Upload::GalleryPreviewService.new
+    render :json => {
+      :crop_button_html => preview_service.crop_button_html(uploader),
+      :gallery_image_url => preview_service.gallery_image_preview(uploader)
+    }
+  rescue Exception => e
+    show_error(e)
+  end
+
+  def remove
+    gallery_service.remove_image(params[:id])
+    render :json => { }
+  rescue Exception => e
+    show_error(e)
+  end
+
+  def sort
+    gallery_service.sort_images(params[:images])
+    render :json => { }
+  rescue Exception => e
+    show_error(e)
+  end
+
+  private
+
+  def show_error(error)
+    render :json => { :error => error.to_s }, :status => :unprocessable_entity
+  end
+
+  def gallery_service
+    @gallery_service ||= RademadeAdmin::Gallery::Manager.new(params[:class_name])
+  end
+
+end

data/app/controllers/rademade_admin/model_controller.rb

@@ -26,9 +26,9 @@ module RademadeAdmin
     end
 
     def update
-      authorize! :update, model_class
       saver = RademadeAdmin::Saver.new(model_info, params)
       saver.find_model
+      authorize! :update, saver.item
       saver.save_data
       success_update saver.item
     rescue Exception => e
@@ -36,37 +36,28 @@ module RademadeAdmin
     end
 
     def destroy
-      authorize! :destroy, model_class
       @item = model.find(params[:id])
+      authorize! :destroy, @item
       @item.delete if @item
       success_delete @item
     end
 
     def autocomplete
       authorize! :read, model_class
-      conditions = Search::Conditions::Autocomplete.new(params, model_info.data_items)
-      @items = Search::Searcher.new(model_info).search(conditions)
-      render :json => Autocomplete::BaseSerializer.new(@items)
+      render :json => Autocomplete::BaseSerializer.new(autocomplete_items)
     end
 
     def link_autocomplete
       authorize! :read, model_class
-
       relation_service = RademadeAdmin::RelationService.new
       @related_model_info = relation_service.related_model_info(model_info, params[:relation])
-
-      conditions = Search::Conditions::Autocomplete.new(params, @related_model_info.data_items)
-      @items = Search::Searcher.new(@related_model_info).search(conditions)
-      render :json => Autocomplete::LinkSerializer.new(@items, model.find(params[:id]), params[:relation])
+      render :json => Autocomplete::LinkSerializer.new(link_autocomplete_items, model.find(params[:id]), params[:relation])
     end
 
     def index
       authorize! :read, model_class
       list_breadcrumbs
-
-      conditions = Search::Conditions::List.new(params, model_info.data_items)
-      @items = Search::Searcher.new(model_info).search(conditions)
-
+      @items = index_items
       respond_to do |format|
         format.html { render_template }
         format.json { render :json => @items }
@@ -75,34 +66,27 @@ module RademadeAdmin
 
     def new
       authorize! :create, model_class
+      @with_create_and_return_button = true
+      @item = new_model
       new_breadcrumbs
-
-      @item = model.new
       render_template
     end
 
     def edit
-      authorize! :update, model_class
       @item = model.find(params[:id])
-
+      authorize! :update, @item
+      @with_create_and_return_button = true
       edit_breadcrumbs
       render_template
     end
 
     def related
       authorize! :read, model_class
-
-      #rm_todo extract relation service
-      relation_service = RademadeAdmin::RelationService.new
-      @related_model_info = relation_service.related_model_info(model_info, params[:relation])
-
+      @related_model_info = RademadeAdmin::RelationService.new.related_model_info(model_info, params[:relation])
       @item = model.find(params[:id])
       search_params = params.except(:id)
-      conditions = Search::Conditions::RelatedList.new(@item, search_params, @related_model_info.data_items)
-      @items = Search::Searcher.new(@related_model_info).search(conditions)
-
+      @items = related_items(search_params)
       @sortable_service = RademadeAdmin::SortableService.new(@related_model_info, search_params)
-
       respond_to do |format|
         format.html {
           related_breadcrumbs
@@ -127,8 +111,8 @@ module RademadeAdmin
     end
 
     def show
-      authorize! :read, model_class
       @item = model.find(params[:id])
+      authorize! :read, @item
       respond_to do |format|
         format.html { redirect_to :action => 'index' }
         format.json { render :json => @item }
@@ -137,7 +121,7 @@ module RademadeAdmin
 
     def form
       authorize! :read, model_class
-      @item = params[:id].blank? ? model.new : model.find(params[:id])
+      @item = params[:id].blank? ? new_model : model.find(params[:id])
       render form_template_path(true), :layout => false
     end
 
@@ -148,6 +132,30 @@ module RademadeAdmin
 
     protected
 
+    def index_items
+      conditions = Search::Conditions::List.new(params, model_info.data_items)
+      Search::Searcher.new(model_info).search(conditions)
+    end
+
+    def autocomplete_items
+      conditions = Search::Conditions::Autocomplete.new(params, model_info.data_items)
+      Search::Searcher.new(model_info).search(conditions)
+    end
+
+    def link_autocomplete_items
+      conditions = Search::Conditions::Autocomplete.new(params, @related_model_info.data_items)
+      Search::Searcher.new(@related_model_info).search(conditions)
+    end
+
+    def related_items(search_params)
+      conditions = Search::Conditions::RelatedList.new(@item, search_params, @related_model_info.data_items)
+      Search::Searcher.new(@related_model_info).search(conditions)
+    end
+
+    def new_model
+      model.new
+    end
+
     def model
       @model ||= model_info.model
     end

data/app/controllers/rademade_admin/sessions_controller.rb

@@ -5,13 +5,14 @@ module RademadeAdmin
     skip_before_action :require_login
 
     def login
-      begin
-        user = RademadeAdmin::Login.admin(params)
-        session[:user_id] = user.id.to_s
-        render :json => user, :status => :ok
-      rescue RademadeAdmin::Login::Error => e
-        render :json => {:errors => e.field_messages}, :status => :precondition_failed
+      user = RademadeAdmin::Login.admin(params)
+      session[:user_id] = user.id.to_s
+      respond_to do |format|
+        format.html { redirect_to :controller => 'dashboard', :action => 'index' }
+        format.json { render :json => user }
       end
+    rescue RademadeAdmin::Login::Error => e
+      render :json => { :errors => e.field_messages }, :status => :precondition_failed
     end
 
     def logout

data/app/controllers/rademade_admin/status_controller.rb

@@ -0,0 +1,16 @@
+# -*- encoding : utf-8 -*-
+module RademadeAdmin
+  class StatusController < RademadeAdmin::AbstractController
+
+    include RademadeAdmin::Notifier
+
+    def toggle
+      authorize! :update, params[:model]
+      status_changer = RademadeAdmin::Status::Toggler.new(params[:model], params[:id])
+      status_changer.init_item
+      status_changer.toggle
+      success_status_change(status_changer.item)
+    end
+
+  end
+end