rademade_admin 0.1.3 → 0.1.4

data/app/helpers/rademade_admin/field_helper.rb

@@ -20,7 +20,7 @@ module RademadeAdmin::FieldHelper
     elsif data_item.has_uploader?
       RademadeAdmin::Upload::PreviewService.new(value).uploaded_file_html
     else
-      value.to_s
+      value.to_s.html_safe
     end
   end
 
@@ -29,10 +29,9 @@ module RademadeAdmin::FieldHelper
     hash_params.delete(:page)
     hash_params[name.to_sym] = number
 
-    options = '?' + hash_params.map { |k, v| "#{k.to_s}=#{v}" }.join('&')
     selected = number == request.query_parameters[name.to_sym].to_i
-
-    content_tag(:option, number.to_s, :selected => selected, :value => request.path + options)
+    url_params = request.path_parameters.merge(hash_params)
+    content_tag(:option, number.to_s, :selected => selected, :value => admin_url_for(url_params, true))
   end
 
   def input_attr(attrs = {})

data/app/helpers/rademade_admin/form_helper.rb

@@ -17,19 +17,21 @@ module RademadeAdmin::FormHelper
     )
   end
 
-  def admin_field(form, form_field, model_info)
-    name = form_field.name
-    attrs = admin_default_params(name, model_info)
-      .merge(field_params(form_field))
-      .merge(input_params(name))
-    concat form.input(name, input_attr(attrs))
+  def admin_field(form, data_item, model_info)
+    if can_read_relation data_item
+      name = data_item.name
+      attrs = admin_default_params(name, model_info)
+        .merge(field_params(data_item))
+        .merge(input_params(name))
+      concat form.input(name, input_attr(attrs))
+    end
   end
 
-  def admin_localized_field(form, form_field, model_info, locale)
-    name = "#{form_field.getter}][#{locale}"
-    attrs = admin_default_params(form_field.name, model_info)
-      .merge(field_params(form_field))
-      .merge(localized_field_params(form_field, locale))
+  def admin_localized_field(form, data_item, model_info, locale)
+    name = "#{data_item.getter}][#{locale}"
+    attrs = admin_default_params(data_item.name, model_info)
+      .merge(field_params(data_item))
+      .merge(localized_field_params(data_item, locale))
     concat form.input(name, input_attr(attrs))
   end
 
@@ -39,9 +41,9 @@ module RademadeAdmin::FormHelper
     { :label => model_info.label_for(name) }
   end
 
-  def field_params(form_field)
-    field_params = form_field.form_params
-    field_params[:as] = default_field_type(form_field) unless field_params[:as].present?
+  def field_params(data_item)
+    field_params = data_item.form_params
+    field_params[:as] = default_field_type(data_item) unless field_params[:as].present?
     field_params
   end
 
@@ -53,24 +55,28 @@ module RademadeAdmin::FormHelper
     }
   end
 
-  def localized_field_params(form_field, locale)
+  def localized_field_params(data_item, locale)
     {
       :input_html => {
-        :id => "#{form_field.getter}_#{locale}_#{@item.id}",
-        :value => localized_value(form_field.getter, locale)
+        :id => "#{data_item.getter}_#{locale}_#{@item.id}",
+        :value => localized_value(data_item.getter, locale)
       }
     }
   end
 
-  def default_field_type(form_field)
-    if form_field.has_relation?
-       :'rademade_admin/related_select'
-    elsif form_field.has_uploader?
-       :'rademade_admin/file'
-    elsif form_field.date_time?
-       :'rademade_admin/date_time'
+  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
+    elsif data_item.has_uploader?
+      :'rademade_admin/file'
+    elsif data_item.date_time?
+      :'rademade_admin/date_time'
     else
-       nil
+      nil
     end
   end
 
@@ -84,4 +90,8 @@ module RademadeAdmin::FormHelper
     item_value
   end
 
+  def can_read_relation(data_item)
+    !data_item.has_relation? || can?(:read, data_item.relation.to)
+  end
+
 end

data/app/helpers/rademade_admin/uri_helper.rb

@@ -79,20 +79,12 @@ module RademadeAdmin::UriHelper
     }))
   end
 
-  def admin_url_for(opts)
-    opts = opts.merge({
-      :controller => "rademade_admin/#{opts[:controller]}",
-      :only_path => true
-    })
-    begin
-      Rails.application.routes.url_helpers.url_for(opts)
-    rescue
-      begin
-        RademadeAdmin::Engine.routes.url_helpers.url_for(opts)
-      rescue
-        nil
-      end
-    end
+  def admin_url_for(opts, is_admin_controller = false)
+    opts[:only_path] = true
+    opts[:controller] = "rademade_admin/#{opts[:controller]}" unless is_admin_controller
+    Rails.application.routes.url_helpers.url_for(opts)
+  rescue
+    RademadeAdmin::Engine.routes.url_helpers.url_for(opts) rescue nil
   end
 
   private

data/app/inputs/rademade_admin/file_input.rb

@@ -7,7 +7,7 @@ module RademadeAdmin
     def input(wrapper_options = {})
       template.content_tag(
         :div,
-        HtmlBuffer.new([file_html]),
+        HtmlBuffer.new([file_html, download_button_html]),
         { :class => 'uploader-block' }
       )
     end
@@ -35,19 +35,16 @@ module RademadeAdmin
         :class => 'btn yellow-btn uploader-input-file',
         :name => uploader.mounted_as,
         :data => {
-          :column => uploader.mounted_as,
-          :id => object.id.to_s,
           :saved => object.new_record? ? 0 : 1,
-          :model => object.class.to_s,
-          :uploader => uploader.class.to_s,
           :url => admin_url_for(:controller => 'file', :action => 'upload')
-        }
+        }.merge(uploader_params)
       })
     end
 
     def input_hidden_html
       @builder.hidden_field(attribute_name, {
-        :class => 'uploader-input-hidden hidden'
+        :class => 'uploader-input-hidden hidden',
+        :value => uploader.url
       }.merge(input_html_options))
     end
 
@@ -67,6 +64,16 @@ module RademadeAdmin
       })
     end
 
+    def download_button_html
+      template.content_tag(:a, I18n.t('rademade_admin.download_file'), {
+        :class => 'btn blue-btn download-btn',
+        :href => admin_url_for({
+          :controller => 'file',
+          :action => 'download'
+        }.merge(uploader_params))
+      }) unless uploader.file.nil?
+    end
+
     def crop_button_html
       template.content_tag(:span, I18n.t('rademade_admin.crop'), {
         :class => 'btn red-btn upload-btn',
@@ -74,7 +81,7 @@ module RademadeAdmin
           :crop => true,
           :url => admin_url_for(:controller => 'file', :action => 'crop')
         }
-      }) if photo_uploader?
+      })
     end
 
     def upload_preview_service
@@ -89,5 +96,14 @@ module RademadeAdmin
       uploader.class.ancestors.include? RademadeAdmin::Uploader::Photo
     end
 
+    def uploader_params
+      {
+        :id => object.id.to_s,
+        :model => object.class.to_s,
+        :uploader => uploader.class.to_s,
+        :column => uploader.mounted_as
+      }
+    end
+
   end
 end

data/app/inputs/rademade_admin/gallery_input.rb

@@ -0,0 +1,77 @@
+# -*- encoding : utf-8 -*-
+module RademadeAdmin
+  class GalleryInput < SimpleForm::Inputs::Base
+
+    include UriHelper
+
+    def input(wrapper_options = {})
+      template.content_tag(
+        :div,
+        HtmlBuffer.new([upload_button_html, gallery_images_html, gallery_hidden_html]),
+        { :class => 'gallery' }
+      )
+    end
+
+    private
+
+    def upload_button_html
+      template.content_tag(:input, '', {
+        :class => 'btn gallery-image-upload',
+        :type => 'file',
+        :multiple => true,
+        :data => {
+          :url => admin_url_for(:controller => 'gallery', :action => 'upload'),
+          :class_name => gallery_class.to_s
+        }
+      })
+    end
+
+    def gallery_images_html
+      is_sortable = gallery_image_info.sortable_relation?
+      template.content_tag(:div, HtmlBuffer.new([images_html]), {
+        :class => 'gallery-images-container',
+        :data => {
+          :sortable_url => is_sortable ? admin_url_for(:controller => 'gallery', :action => 'sort') : ''
+        }
+      })
+    end
+
+    def gallery_hidden_html
+      template.content_tag(:input, '', {
+        :type => 'hidden',
+        :name => "data[#{gallery_info.getter}]",
+        :value => gallery.id.to_s
+      })
+    end
+
+    def images_html
+      html = ''
+      preview_service = RademadeAdmin::Upload::GalleryPreviewService.new
+      gallery.images.each do |gallery_image|
+        html += preview_service.preview_html(gallery_image.image)
+      end
+      html
+    end
+
+    def gallery
+      @gallery ||= object.send(attribute_name) || gallery_class.create
+    end
+
+    def gallery_info
+      @gallery_relation ||= model_info(object.class.to_s, attribute_name)
+    end
+
+    def gallery_image_info
+      @gallery_image_info ||= model_info(gallery_class, :images)
+    end
+
+    def gallery_class
+      @gallery_class ||= gallery_info.relation.to
+    end
+
+    def model_info(class_name, data_item_name)
+      RademadeAdmin::Model::Graph.instance.model_info(class_name).data_items.data_item(data_item_name)
+    end
+
+  end
+end

data/app/inputs/rademade_admin/related_select_input.rb

@@ -27,7 +27,7 @@ module RademadeAdmin
       if multiple?
         related_list_html
       else
-        related_item_html
+        RademadeAdmin::HtmlBuffer.new([related_item_html, edit_button_html])
       end
     end
 
@@ -55,11 +55,13 @@ module RademadeAdmin
     end
 
     def reflection_data
-      {
+      search_url = admin_autocomplete_uri(related_to, :format => :json)
+      data = {
         :'rel-multiple' => multiple?,
-        :'rel-class' => related_to.to_s,
-        :'search-url' => admin_autocomplete_uri(related_to, :format => :json)
+        :'rel-class' => related_to.to_s
       }
+      data[:'search-url'] = search_url unless search_url.nil?
+      data
     end
 
     def related_item_html
@@ -74,5 +76,12 @@ module RademadeAdmin
       end
     end
 
+    def edit_button_html
+      template.content_tag(:button, I18n.t('rademade_admin.edit_related_item'), {
+        :class => 'btn blue-btn',
+        :'data-edit-relation' => true
+      })
+    end
+
   end
 end

data/app/serializers/autocomplete/base_serializer.rb

@@ -35,7 +35,7 @@ module Autocomplete
       {
         :id => item.id.to_s,
         :text => (item.respond_to?(:to_autocomplete) ? item.to_autocomplete : item.to_s),
-        :edit_url => admin_edit_form_uri(item)
+        :editurl => admin_edit_form_uri(item)
       }
     end
 

data/app/services/gallery/manager.rb

@@ -0,0 +1,81 @@
+module RademadeAdmin
+  module Gallery
+    class Manager
+
+      attr_reader :gallery_images_html
+
+      def initialize(class_name)
+        @class_name = class_name
+        init_gallery_models
+      end
+
+      def upload_images(gallery_id, files)
+        find_gallery gallery_id
+        upload_gallery_images files
+        @gallery.save
+      end
+
+      def crop_image(image_id, crop_data)
+        gallery_image = @gallery_image_relation.to.find(image_id)
+        uploader = gallery_image.image
+        image = uploader.crop_image(crop_data)
+        uploader.store!(image)
+        gallery_image.save
+        uploader
+      end
+
+      def remove_image(image_id)
+        @gallery_image_relation.to.find(image_id).destroy
+      end
+
+      def sort_images(images)
+        sort_gallery_images images
+      end
+
+      private
+
+      def init_gallery_models
+        gallery_info = RademadeAdmin::Model::Graph.instance.model_info(@class_name)
+        @gallery_model = gallery_info.model
+        @gallery_image_relation = gallery_info.data_items.data_item(:images).relation
+      end
+
+      def find_gallery(gallery_id)
+        @gallery = @gallery_model.find(gallery_id)
+      end
+
+      def upload_gallery_images(images)
+        preview_service = RademadeAdmin::Upload::GalleryPreviewService.new
+        @gallery_images_html = []
+        images.each do |image|
+          gallery_image = @gallery_image_relation.to.create
+          gallery_image.image.store! image
+          update_gallery_image_position(gallery_image)
+          @gallery.images << gallery_image
+          @gallery_images_html << preview_service.preview_html(gallery_image.image)
+        end
+      end
+
+      def sort_gallery_images(images)
+        images.each_with_index do |image_id, index|
+          gallery_image = @gallery_image_relation.to.find(image_id)
+          set_gallery_image_position(gallery_image, index)
+          gallery_image.save
+        end
+      end
+
+      def update_gallery_image_position(gallery_image)
+        if @gallery_image_relation.sortable?
+          last_image = @gallery.images.last
+          previous_position = last_image.nil? ? 0 : last_image.send(:"#{@gallery_image_relation.sortable_field}")
+          set_gallery_image_position(gallery_image, previous_position + 1)
+        end
+      end
+
+      def set_gallery_image_position(gallery_image, position)
+        gallery_image.send(:"#{@gallery_image_relation.sortable_field}=", position)
+      end
+
+    end
+  end
+end

data/app/services/login.rb

@@ -6,9 +6,9 @@ module RademadeAdmin
       params.require(:data).permit([:email, :password])
       user = RademadeAdmin.user_class.get_by_email(params[:data][:email])
 
-      error('There is no users with such email', :email) unless user.is_a? RademadeAdmin.user_class
-      error('Incorrect password', :password) unless user.valid_password? params[:data][:password]
-      error('Access denied', :email) unless user.admin?
+      error(I18n.t('rademade_admin.login_email_not_found'), :email) unless user.is_a? RademadeAdmin.user_class
+      error(I18n.t('rademade_admin.login_incorrect_password'), :password) unless user.valid_password? params[:data][:password]
+      error(I18n.t('rademade_admin.login_access_denied'), :email) unless user.admin?
 
       user
     end

data/app/services/menu_service.rb

@@ -16,7 +16,7 @@ module RademadeAdmin
     def collect_children(parent_model = nil)
       menu_items = []
       @model_infos.each do |model_info|
-        if model_info.parent_model == parent_model && model_info.display_in_menu?
+        if model_info.parent_model == parent_model
           menu_items << RademadeAdmin::MenuService::MenuItem.new(model_info, collect_children(model_info.model))
         end
       end