rademade_admin 0.1.3 → 0.1.4

data/app/services/menu_service/menu_item.rb

@@ -9,6 +9,10 @@ module RademadeAdmin
         @model_info.item_name
       end
 
+      def count
+        @model_info.menu_count
+      end
+
       def model
         @model_info.model
       end

data/app/services/model_controller/model_options.rb

@@ -7,6 +7,7 @@ module RademadeAdmin
     #  - model
     #  - name
     #  - parent_menu (todo extract to menu method)
+    #  - menu_count
     #  - list
     #  - form
     #  - labels

data/app/services/model_controller/notifier.rb

@@ -4,7 +4,7 @@ module RademadeAdmin
 
     def success_action
       render :json => {
-        :message => 'ok'
+        :message => I18n.t('rademade_admin.success_message')
       }
     end
 
@@ -12,9 +12,12 @@ module RademadeAdmin
       respond_to do |format|
         format.html { redirect_to admin_edit_uri(item) }
         format.json {
-          success_message(item, 'was inserted!', {
-            :form_action => admin_update_uri(item)
-          })
+          if params.has_key?(:create_and_return)
+            data = { :redirect_to => admin_list_uri(item.class) }
+          else
+            data = { :form_action => admin_update_uri(item) }
+          end
+          success_message(item, I18n.t('rademade_admin.success_insert_message'), data)
         }
       end
     end
@@ -23,7 +26,9 @@ module RademadeAdmin
       respond_to do |format|
         format.html { redirect_to admin_edit_uri(item) }
         format.json {
-          success_message(item, 'data was updated!')
+          data = {}
+          data[:redirect_to] = admin_list_uri(item.class) if params.has_key?(:create_and_return)
+          success_message(item, I18n.t('rademade_admin.success_update_message'), data)
         }
       end
     end
@@ -32,27 +37,36 @@ module RademadeAdmin
       respond_to do |format|
         format.html { redirect_to admin_list_uri(item) }
         format.json {
-          success_message(item, 'was deleted!')
+          success_message(item, I18n.t('rademade_admin.success_delete_message'))
+        }
+      end
+    end
+    
+    def success_status_change(item)
+      respond_to do |format|
+        format.html { redirect_to admin_list_uri(item) }
+        format.json {
+          success_message(item, t('rademade_admin.success_status_update_message'))
         }
       end
     end
 
     def success_unlink
       render :json => {
-        :message => 'Entity was unlinked!'
+        :message => I18n.t('rademade_admin.success_unlink_message')
       }
     end
 
     def success_link
       render :json => {
-        :message => 'Entity was linked!'
+        :message => I18n.t('rademade_admin.success_link_message')
       }
     end
 
-    def success_message(item, action_message, additional_data = {})
+    def success_message(item, message, additional_data = {})
       render :json => {
         :data => Autocomplete::BaseSerializer.new([item]).as_json.first,
-        :message => "#{model_info.singular_name.capitalize} #{action_message}"
+        :message => message
       }.merge(additional_data)
     end
 

data/app/services/search/conditions/autocomplete.rb

@@ -1,16 +1,19 @@
 # -*- encoding : utf-8 -*-
 require 'search/conditions/abstract'
+require 'search/where'
 
 module RademadeAdmin
   module Search
     module Conditions
       class Autocomplete < Abstract
 
+        include RademadeAdmin::Search::Where
+
         protected
 
         def where
           @where_conditions = RademadeAdmin::Search::Part::Where.new(:and)
-          append_query_condition
+          regex_filter(@where_conditions, @params[:q])
           append_search_params
           append_ids_params
           @where_conditions
@@ -22,16 +25,6 @@ module RademadeAdmin
 
         private
 
-        def append_query_condition
-          if @params[:q].present? and not @data_items.filter_fields.empty?
-            query_where = RademadeAdmin::Search::Part::Where.new(:or)
-            @data_items.filter_fields.each do |field|
-              query_where.add(field, /#{@params[:q]}/i)
-            end
-            @where_conditions.sub_add(query_where)
-          end
-        end
-
         def append_search_params
           if @params[:search].present?
             @params[:search].each do |key, value|

data/app/services/search/conditions/list.rb

@@ -1,25 +1,27 @@
 # -*- encoding : utf-8 -*-
 require 'search/conditions/abstract'
+require 'search/where'
 
 module RademadeAdmin
   module Search
     module Conditions
       class List < Abstract
 
+        include RademadeAdmin::Search::Where
+
         protected
 
         def where
-          where_conditions = RademadeAdmin::Search::Part::Where.new(:and)
-          @params.slice(*@data_items.origin_fields).each do |field, value|
-            where_conditions.add(field, value)
-          end
-          where_conditions
+          @where_conditions = RademadeAdmin::Search::Part::Where.new(:and)
+          search_by_fields
+          regex_filter(@where_conditions, @params[:q])
+          @where_conditions
         end
 
         def order
           order_conditions = super
-          field = @params[:sort] || default_order_field
-          order_conditions.unshift(field, @params[:direction])
+          list_order_field = order_field
+          order_conditions.unshift(list_order_field, @params[:direction]) unless list_order_field.nil?
           order_conditions
         end
 
@@ -33,11 +35,21 @@ module RademadeAdmin
 
         private
 
-        def default_order_field
-          @data_items.has_field?(:position) ? :position : :id
+        def order_field
+          if @params[:sort]
+            @params[:sort]
+          else
+            @data_items.has_field?(:position) ? :position : nil
+          end
+        end
+
+        def search_by_fields
+          @params.slice(*@data_items.origin_fields).each do |field, value|
+            @where_conditions.add(field, value)
+          end
         end
 
       end
     end
   end
-end
+end

data/app/services/search/conditions/related_list.rb

@@ -26,8 +26,8 @@ module RademadeAdmin
 
         def order
           order_conditions = super
-          field = @params[:sort] || default_order_field
-          order_conditions.unshift(field, @params[:direction])
+          related_order_field = order_field
+          order_conditions.unshift(related_order_field, @params[:direction]) unless related_order_field.nil?
           order_conditions
         end
 
@@ -41,8 +41,12 @@ module RademadeAdmin
 
         private
 
-        def default_order_field
-          @data_items.has_field?(:position) ? :position : :id
+        def order_field
+          if @params[:sort]
+            @params[:sort]
+          else
+            @data_items.has_field?(:position) ? :position : nil
+          end
         end
 
         def related_item_ids

data/app/services/search/where.rb

@@ -0,0 +1,20 @@
+module RademadeAdmin
+  module Search
+    module Where
+
+      protected
+
+      def regex_filter(where_conditions, search)
+        if search.present? and not @data_items.filter_fields.empty?
+          query_where = RademadeAdmin::Search::Part::Where.new(:or)
+          @data_items.filter_fields.each do |field|
+            query_where.add(field, /#{search}/i)
+          end
+          where_conditions.sub_add(query_where)
+        end
+        where_conditions
+      end
+
+    end
+  end
+end

data/app/services/sortable_service.rb

@@ -19,11 +19,8 @@ module RademadeAdmin
       @params[:sort].present?
     end
 
-    #
-    # @return [RademadeAdmin::Model::Info::DataItem]
-    #
     def sorting_sign(field)
-      if field.name.to_s == @params[:sort]
+      if field.order_column.to_s == @params[:sort]
         return '⬇' if @params[:direction] == 'asc'
         return '⬆' if @params[:direction] == 'desc'
       end

data/app/services/status/toggler.rb

@@ -0,0 +1,27 @@
+# -*- encoding : utf-8 -*-
+module RademadeAdmin
+  module Status
+    class Toggler
+
+      attr_reader :item
+
+      def initialize(model, id)
+        @model = model
+        @id = id
+      end
+
+      def init_item
+        @model_info = RademadeAdmin::Model::Graph.instance.model_info @model
+        @item = @model_info.model.find @id
+      end
+
+      def toggle
+        if @model_info.hideable?
+          @item.toggle
+          @item.save
+        end
+      end
+
+    end
+  end
+end

data/app/services/template_service.rb

@@ -9,23 +9,39 @@ module RademadeAdmin
     def template_path(*directories)
       "#{@root_dir}/#{directories.join('/')}"
     end
+    
+    def index_template
+      abstract_template 'index'
+    end
 
     def inner_layout
       layout_path 'inner'
     end
 
+    def main_layout
+      layout_path 'main'
+    end
+
     def inner_form_layout
       layout_path 'inner/form'
     end
 
+    def form_block
+      block_path 'form'
+    end
+
     def form_control_block
       block_path 'form/control'
     end
 
-    def form_lang_panel
+    def form_lang_panel_block
       block_path 'form/lang_panel'
     end
 
+    def form_separator_block
+      block_path 'form/separator'
+    end
+
     def pagination_block
       block_path 'pagination'
     end
@@ -34,6 +50,14 @@ module RademadeAdmin
       block_path 'on_page_select'
     end
 
+    def sort_reset_block
+      block_path 'sort_reset'
+    end
+
+    def search_block
+      block_path 'search'
+    end
+
     def header_block
       block_path 'header'
     end
@@ -54,8 +78,16 @@ module RademadeAdmin
       block_path 'table/head'
     end
 
+    def cancel_button
+      block_path 'button/cancel'
+    end
+
     private
 
+    def abstract_template(path)
+      template_path 'abstract', path
+    end
+
     def layout_path(layout)
       template_path '_layouts', layout
     end

data/app/services/upload/gallery_preview_service.rb

@@ -0,0 +1,64 @@
+# -*- encoding : utf-8 -*-
+module RademadeAdmin
+  module Upload
+    class GalleryPreviewService
+
+      include ActionView::Helpers::TagHelper
+      include ActionView::Context
+      include UriHelper
+
+      def preview_html(uploader)
+        content_tag(:div, HtmlBuffer.new([
+          gallery_image_html(uploader),
+          remove_ico_html(uploader),
+          crop_button_html(uploader)
+        ]), {
+          :class => 'gallery-image',
+          :data => {
+            :id => uploader.model.id.to_s
+          }
+        })
+      end
+
+      def crop_button_html(uploader)
+        content_tag(:span, I18n.translate('rademade_admin.crop'), {
+          :class => 'btn red-btn crop-btn',
+          :data => {
+            :crop => true,
+            :url => admin_url_for(:controller => 'gallery', :action => 'crop'),
+            :full_url => uploader.url,
+            :original_dimensions => uploader.original_dimensions.join(',')
+          }
+        }) if uploader.class.ancestors.include? RademadeAdmin::Uploader::CropPhoto
+      end
+
+      def gallery_image_preview(uploader)
+        uploader.resize(150, 100)
+      end
+
+      private
+
+      def gallery_image_html(uploader)
+        content_tag(:img, '', {
+          :src => gallery_image_preview(uploader),
+          :width => 150,
+          :height => 100
+        })
+      end
+
+      def remove_ico_html(uploader)
+        content_tag(:span, 'x', {
+          :class => 'remove-ico',
+          :data => {
+            :url => admin_url_for(
+              :controller => 'gallery',
+              :action => 'remove',
+              :id => uploader.model.id.to_s
+            )
+          }
+        })
+      end
+
+    end
+  end
+end

data/app/views/layouts/rademade_admin.html.erb

@@ -1,22 +1 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Rademade Admin</title>
-        <%= stylesheet_link_tag(:rademade_admin, :media => 'all', 'data-turbolinks-track' => true) %>
-        <%= javascript_include_tag(:rademade_admin, 'data-turbolinks-track' => true) %>
-        <%= csrf_meta_tags %>
-    </head>
-
-    <body>
-        <div class="wrapper">
-            <%= yield %>
-        </div>
-    </body>
-
-    <%= javascript_tag do %>
-        I18n.defaultLocale = "<%= I18n.default_locale %>";
-        I18n.locale = "<%= I18n.locale %>";
-        I18n.fallbacks = true;
-    <% end %>
-
-</html>
+<%= render :template => @template_service.main_layout %>