rademade_admin 0.1.5 → 0.1.6

data/app/helpers/rademade_admin/form_helper.rb

@@ -65,12 +65,10 @@ module RademadeAdmin::FormHelper
   end
 
   def default_field_type(data_item)
-    if data_item.has_relation?
-      if data_item.gallery_relation?
-        :'rademade_admin/gallery'
-      else
-        :'rademade_admin/related_select'
-      end
+    if data_item.gallery_relation?
+      :'rademade_admin/gallery'
+    elsif data_item.has_relation?
+      :'rademade_admin/related_select'
     elsif data_item.has_uploader?
       :'rademade_admin/file'
     elsif data_item.date_time?

data/app/helpers/rademade_admin/uri_helper.rb

@@ -10,10 +10,10 @@ module RademadeAdmin::UriHelper
     RademadeAdmin::Engine.routes.url_helpers.send(route_url, opts)
   end
 
-  def admin_list_uri(model)
-    admin_model_url_for(model, {
+  def admin_list_uri(model, opts = {})
+    admin_model_url_for(model, opts.merge({
       :action => :index
-    })
+    }))
   end
 
   def admin_autocomplete_uri(model, opts = {})

data/app/services/csv_service.rb

@@ -0,0 +1,38 @@
+# -*- encoding : utf-8 -*-
+require 'csv'
+
+module RademadeAdmin
+  class CsvService
+
+    def initialize(model_info, items)
+      @model_info = model_info
+      @items = items
+    end
+
+    def to_csv
+      ::CSV.generate(col_sep: ',', encoding: 'utf-8') do |csv|
+        csv << column_names
+        @items.each do |item|
+          csv << item_data(item)
+        end
+      end
+    end
+
+    def column_names
+      @model_info.data_items.csv_fields.map(&:label)
+    end
+
+    def item_data(item)
+      data = []
+      @model_info.data_items.csv_fields.each do |field|
+        data << field_value(field, item)
+      end
+      data
+    end
+
+    def field_value(field, item)
+      return field.csv_preview_handler.call(item) unless field.csv_preview_handler.nil?
+      item.send(field.csv_preview_accessor).to_s
+    end
+  end
+end

data/app/services/linker.rb

@@ -13,7 +13,9 @@ module RademadeAdmin
     end
 
     def unlink(id)
-      process_link { |old_data| old_data - [@related_data_item.relation.related_entities(id)] }
+      process_link { |old_data|
+        old_data.delete_if { |data_item| data_item.id.to_s == id.to_s }
+      }
     end
 
     private

data/app/services/model_controller/instance_options.rb

@@ -2,9 +2,14 @@
 module RademadeAdmin
   module InstanceOptions
 
-    attr_reader :model_info, :model_class, :model_name, :item_name,
+    attr_reader :model_info,
+                :model_class,
+                :model_name,
+                :item_name,
                 :list_fields,
-                :form_fields_without_locale, :form_fields_with_locale
+                # TODO form_fields refactor
+                :form_fields_without_locale,
+                :form_fields_with_locale
 
     def load_model_options
       @model_info = self.class.model_info

data/app/services/model_controller/notifier.rb

@@ -2,6 +2,8 @@
 module RademadeAdmin
   module Notifier
 
+    # TODO use responder (respond with)
+
     def success_action
       render :json => {
         :message => I18n.t('rademade_admin.success_message')
@@ -11,43 +13,28 @@ module RademadeAdmin
     def success_insert(item)
       respond_to do |format|
         format.html { redirect_to admin_edit_uri(item) }
-        format.json {
-          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)
-        }
+        format.json { success_message(item, I18n.t('rademade_admin.success_insert_message'), success_data(item)) }
       end
     end
 
     def success_update(item)
       respond_to do |format|
         format.html { redirect_to admin_edit_uri(item) }
-        format.json {
-          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)
-        }
+        format.json { success_message(item, I18n.t('rademade_admin.success_update_message'), success_data(item)) }
       end
     end
 
     def success_delete(item)
       respond_to do |format|
         format.html { redirect_to admin_list_uri(item) }
-        format.json {
-          success_message(item, I18n.t('rademade_admin.success_delete_message'))
-        }
+        format.json { 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'))
-        }
+        format.json { success_message(item, t('rademade_admin.success_status_update_message')) }
       end
     end
 
@@ -70,5 +57,14 @@ module RademadeAdmin
       }.merge(additional_data)
     end
 
+    def success_data(item)
+      data = {}
+      if params.has_key?(:create_and_return)
+        data[:redirect_to] = admin_list_uri(item.class)
+      else
+        data[:form_action] = admin_update_uri(item) # TODO check JS. Rename for update
+      end
+      data
+    end
   end
 end

data/app/services/model_controller/templates.rb

@@ -14,6 +14,7 @@ module RademadeAdmin
     end
 
     def abstract_template(template)
+      # TODO make with rails native controller extending
       if template_exists?(template, @template_service.template_path(native_template_folder))
         folder = native_template_folder
       else

data/app/services/saver.rb

@@ -68,7 +68,12 @@ module RademadeAdmin
       unless image_path.blank?
         full_image_path = "#{CarrierWave.root}#{image_path}"
         begin
-          (item.try(:translation) || item).send(data_item.setter, File.open(full_image_path))
+          if item.try(:translation).respond_to? data_item.setter
+            entity = item.translation
+          else
+            entity = item
+          end
+          entity.send(data_item.setter, File.open(full_image_path))
         rescue
           # rm_todo clear image
         end

data/app/services/template_service.rb

@@ -2,6 +2,25 @@
 module RademadeAdmin
   class TemplateService
 
+    attr_accessor :index_template,
+                  :inner_layout,
+                  :main_layout,
+                  :inner_form_layout,
+                  :form_block,
+                  :form_control_block,
+                  :form_lang_panel_block,
+                  :form_separator_block,
+                  :pagination_block ,
+                  :on_page_select_block,
+                  :sort_reset_block,
+                  :search_block,
+                  :header_block,
+                  :menu_block,
+                  :sub_menu_block,
+                  :sub_menu_link_block,
+                  :table_head_block,
+                  :cancel_button
+
     def initialize(root_dir)
       @root_dir = root_dir
     end
@@ -11,75 +30,75 @@ module RademadeAdmin
     end
     
     def index_template
-      abstract_template 'index'
+      @index_template ||= abstract_template 'index'
     end
 
     def inner_layout
-      layout_path 'inner'
+      @inner_layout ||= layout_path 'inner'
     end
 
     def main_layout
-      layout_path 'main'
+      @main_layout ||= layout_path 'main'
     end
 
     def inner_form_layout
-      layout_path 'inner/form'
+      @inner_form_layout ||= layout_path 'inner/form'
     end
 
     def form_block
-      block_path 'form'
+      @form_block ||= block_path 'form'
     end
 
     def form_control_block
-      block_path 'form/control'
+      @form_control_block ||= block_path 'form/control'
     end
 
     def form_lang_panel_block
-      block_path 'form/lang_panel'
+      @form_lang_panel_block ||= block_path 'form/lang_panel'
     end
 
     def form_separator_block
-      block_path 'form/separator'
+      @form_separator_block ||= block_path 'form/separator'
     end
 
     def pagination_block
-      block_path 'pagination'
+      @pagination_block ||= block_path 'pagination'
     end
 
     def on_page_select_block
-      block_path 'on_page_select'
+      @on_page_select_block ||= block_path 'on_page_select'
     end
 
     def sort_reset_block
-      block_path 'sort_reset'
+      @sort_reset_block ||= block_path 'sort_reset'
     end
 
     def search_block
-      block_path 'search'
+      @search_block ||= block_path 'search'
     end
 
     def header_block
-      block_path 'header'
+      @header_block ||= block_path 'header'
     end
 
     def menu_block
-      block_path 'menu'
+      @menu_block ||= block_path 'menu'
     end
 
     def sub_menu_block
-      block_path 'sub_menu'
+      @sub_menu_block ||= block_path 'sub_menu'
     end
 
     def sub_menu_link_block
-      block_path 'sub_menu/link'
+      @sub_menu_link_block ||= block_path 'sub_menu/link'
     end
 
     def table_head_block
-      block_path 'table/head'
+      @table_head_block ||= block_path 'table/head'
     end
 
     def cancel_button
-      block_path 'button/cancel'
+      @cancel_button ||= block_path 'button/cancel'
     end
 
     private
@@ -97,4 +116,4 @@ module RademadeAdmin
     end
 
   end
-end
+end

data/app/services/upload/preview_service.rb

@@ -12,7 +12,7 @@ module RademadeAdmin
 
       def preview_html
         content_tag(:div, :class => ['preview-wrapper', preview_style_class].join(' ')) do
-          if @uploader.blank?
+          if @uploader.blank? || @uploader.size.zero?
             empty_file_html
           else
             uploaded_file_html
@@ -63,6 +63,7 @@ module RademadeAdmin
       def uploaded_image_preview
         content_tag(:img, '', {
           :src => @uploader.resize(230, 130),
+          :'full-url' => @uploader.url,
           :class => 'image-preview',
           :width => 230,
           :height => 130,

data/app/views/rademade_admin/_blocks/_form.html.erb

@@ -1,10 +1,11 @@
 <%
 show_buttons = show_buttons.nil? ? true : show_buttons
 buttons_template ||= @template_service.form_control_block
-%><%= admin_form(@item, @model_class) do |f| %><%
+%><%= admin_form(@item, @model_class) do |form| %><%
     @form_fields_without_locale.each do |form_field|
-        admin_field(f, form_field, @model_info)
+        admin_field(form, form_field, @model_info)
     end
-    concat render @template_service.form_lang_panel_block, { :f => f }
-    concat render buttons_template, { :f => f } if show_buttons
-end %>
+    concat yield(:additional_fields) if content_for?(:additional_fields)
+    concat render @template_service.form_lang_panel_block, { :f => form }
+    concat render buttons_template, { :f => form } if show_buttons
+end %>

data/app/views/rademade_admin/_blocks/button/_hide.html.erb

@@ -2,11 +2,11 @@
 if @model_info.hideable? && can?(:edit, @model)
     element_id = "hide_#{item.id}"
     toggle_url = admin_url_for(
-        :controller => :status,
+        :controller => :"rademade_admin/status",
         :action => :toggle,
         :model => @model,
         :id => item.id
-    ) #todo via native method. Add route resourse
+    ) #todo via native method. Add route resource
 
     %><div class="view-option">
         <input id="<%=element_id%>" data-toggle-url="<%= toggle_url %>" type="checkbox"<%

data/app/views/rademade_admin/_layouts/main.html.erb

@@ -1,13 +1,10 @@
-<% content_for :head do %>
-    <%= stylesheet_link_tag(:rademade_admin, :media => 'all', 'data-turbolinks-track' => true) %>
-    <%= javascript_include_tag(:rademade_admin, 'data-turbolinks-track' => true) %>
-<% end %>
-
 <!DOCTYPE html>
 <html>
     <head>
         <title>Rademade Admin</title>
-        <%= yield(:head) %>
+        <%= javascript_include_tag(:rademade_admin, 'data-turbolinks-track' => true) %>
+        <%= yield(:head) if content_for?(:head) %>
+        <%= stylesheet_link_tag(:rademade_admin, :media => 'all', 'data-turbolinks-track' => true) %>
         <%= csrf_meta_tags %>
     </head>
 

data/app/views/rademade_admin/abstract/index.html.erb

@@ -4,8 +4,10 @@
 
 <% content_for :nav_buttons do %><%
     new_uri = admin_new_uri(@model_info)
-    if new_uri
-        concat link_to t('rademade_admin.new_record') + '+', new_uri, :class => 'btn yellow-btn fl-l'
+    concat link_to(t('rademade_admin.new_record') + '+', new_uri, :class => 'btn yellow-btn fl-l') if new_uri
+    if @model_info.has_csv?
+        csv_uri = admin_list_uri(@model_info, :format => :csv)
+        concat link_to(t('rademade_admin.export_to_csv'), csv_uri, :class => 'btn green-btn fl-l l-margin') if csv_uri
     end
 end %>
 

data/config/locales/rademade_admin.en.yml

@@ -45,4 +45,5 @@ en:
     success_unlink_message: "Entity was unlinked!"
     success_link_message: "Entity was linked!"
     success_status_update_message: "Status was updated!"
-    clear_search: "Clear"
+    clear_search: "Clear"
+    export_to_csv: "Export to csv"

data/config/locales/rademade_admin.ru.yml

@@ -45,4 +45,5 @@ ru:
     success_unlink_message: "Запись отсоединена!"
     success_link_message: "Запись соединена!"
     success_status_update_message: "Статус обновлен!"
-    clear_search: "Очистить"
+    clear_search: "Очистить"
+    export_to_csv: "Экспортировать в csv"

data/lib/rademade_admin/input/related_select_input/related_list.rb

@@ -37,17 +37,20 @@ module RademadeAdmin
 
         def related_list_item_edit_html(serialized_value)
           if serialized_value[:editurl]
-            template.content_tag(
-              :button, I18n.t('rademade_admin.edit_related_item'),
-              :'data-edit' => serialized_value[:editurl]
-            )
+            template.content_tag(:button, I18n.t('rademade_admin.edit_related_item'), {
+              :'data-edit' => serialized_value[:editurl],
+              :class => 'select2-item-edit'
+            })
           else
             ''
           end
         end
 
         def related_list_item_remove_html
-          template.content_tag(:button, I18n.t('rademade_admin.destroy'), :'data-remove' => '')
+          template.content_tag(:button, I18n.t('rademade_admin.destroy'), {
+            :'data-remove' => '',
+            :class => 'select2-item-remove'
+          })
         end
 
         def related_list_link_html