redde 0.3.23 → 0.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0efa702172d1b777179f2041fdab06a083f4f01
-  data.tar.gz: eb958f7bc8cc84e9524ea3f586bfa05d8d58480c
+  metadata.gz: c4a929d175b37bbd530e0430504cf643ab11a4e8
+  data.tar.gz: 5c9c478d9a0879200ab9f8a953ca0af002fa246a
 SHA512:
-  metadata.gz: 458cdf655e6ee8990d5aafe0e48bc231112cce07c35dff89d13a01bf894182fca5842aef1c8bc9a67aeada5091537b076845c097b5c5b81d2de602ff27cd2c8c
-  data.tar.gz: cede951278c32817510c45fe5e2d73c72cfb875a05c2876f43f9a2ea0e188eaf302fdb21a0a74d81d37a68e1c13307ab5fec8aad31b777df0b91bbee9879b83c
+  metadata.gz: 34dd432d80560a684109474d084db0a5378a8ec19702d6a269ddab2eb15fda49f14fa00e3ddfa535d353697da1399d4a584bb5a01f364fed0dd7433ef8b5822e
+  data.tar.gz: b3e6908d2bff02e27078485ecb0bbddbd411b95a4c56c916f14ad0e670f46a5c4f75d374f8802c058fb2635730b797d859e02b1adfd4c1ba0188f42e6e9c542c

data/app/assets/javascripts/redde/fileapi.js.coffee

@@ -12,6 +12,13 @@ $ ->
     accept: "image/*"
     onFileComplete: (e, uiEvt)->
       if uiEvt.status is 200 && uiEvt.error is false
-        $('.js-photos').append( uiEvt.result )
+        $photo = $( uiEvt.result )
+        $photo.appendTo( $('.js-photos') )
+        if !$box.find("input[name='redde_photo[imageable_id]']").val()
+          id = $photo.attr('id').replace(/\D/gi, '')
+          $form = $('form[data-redde]')
+          formId = $form.attr('id')
+          objectName = $form.data('redde').objectName
+          $photo.append("<input type='hidden' name='#{objectName}[photo_ids][]' value='#{id}' form='#{formId}'>")
       else
         alert('Ошибка загрузки')

data/app/controllers/admin/redde_photos_controller.rb

@@ -8,8 +8,12 @@ class Admin::ReddePhotosController < ActionController::Base
   end
 
   def create
-    parent = photo_params[:imageable_type].constantize.find(photo_params[:imageable_id])
-    @photo = parent.photos.build(photo_params)
+    if photo_params[:imageable_id].present?
+      parent = photo_params[:imageable_type].constantize.find(photo_params[:imageable_id])
+      @photo = parent.photos.build(photo_params)
+    else
+      @photo = Redde::Photo.new(photo_params)
+    end
     if @photo.save
       render(partial: 'photo', object: @photo)
     else

data/app/helpers/redde/admin_helper.rb

@@ -24,7 +24,7 @@ module Redde::AdminHelper
     capture do
       concat page_header
       concat redde_form_for([:admin, item]) { |f| capture(f, &block) }
-      concat photoable(item)
+      concat render('admin/redde_photos/photos', parent: item) if item.class.reflect_on_association(:photos)
     end
   end
 
@@ -61,10 +61,6 @@ module Redde::AdminHelper
     link_to title, path, class: classes
   end
 
-  def photoable(parent)
-    render('admin/redde_photos/photos', parent: parent) if parent.class.reflect_on_association(:photos)
-  end
-
   def tsingular(model)
     model.model_name.human
   end

data/app/helpers/redde/form_helper.rb

@@ -10,6 +10,7 @@ module Redde::FormHelper
   def redde_form_for(object, options = {}, &block)
     options = make_options(options)
     options[:builder] ||= ReddeFormBuilder
+    options[:html] = { 'data-redde' => { objectName: (object.kind_of?(Array) ? object.last : object).class.model_name.param_key }.to_json }
 
     with_clean_form_field_error_proc do
       form_for(object, options) do |f|

data/app/views/admin/redde_photos/_photos.haml

@@ -1,23 +1,22 @@
-- unless parent.new_record?
-  = page_sidebar raw("Фотографии ").concat(if editable ||= false then link_to("ред.", [:admin, parent]) end) do
-    %ul.photos.js-photos{ "data-sortable" => { items: :li, handle: nil, axis: nil, url: url_for([:sort, :admin, :redde_photos])}.to_json }
-      = render partial: 'admin/redde_photos/photo', collection: parent.photos
+= page_sidebar raw("Фотографии ").concat(if editable ||= false then link_to("ред.", [:admin, parent]) end) do
+  %ul.photos.js-photos{ "data-sortable" => { items: :li, handle: nil, axis: nil, url: url_for([:sort, :admin, :redde_photos])}.to_json, form: 'new_article' }
+    = render partial: 'admin/redde_photos/photo', collection: parent.photos
 
-    -#
-      #preview
-      #drag-n-drop{:style => "display: none; margin-top: 5px;"}
-        #drop-zone.b-dropzone{style: 'height: 100px;', data: {"upload-url" => url_for([:admin, parent, :photos])}}
-          .b-dropzone__bg
-          .b-dropzone__txt Перетащите файлы сюда
+  -#
+    #preview
+    #drag-n-drop{:style => "display: none; margin-top: 5px;"}
+      #drop-zone.b-dropzone{style: 'height: 100px;', data: {"upload-url" => url_for([:admin, Redde::Photo])}}
+        .b-dropzone__bg
+        .b-dropzone__txt Перетащите файлы сюда
 
-      #buttons-panel{style: 'margin-bottom: 10px;'}
-        .b-button.js-fileapi-wrapper
-          .b-button__text Загрузить файлы
-          %input.b-button__input.js-fileapi{:name => "files", :type => "file",  :multiple => true, data: {"upload-url" => url_for([:admin, parent, :photos])}}
+    #buttons-panel{style: 'margin-bottom: 10px;'}
+      .b-button.js-fileapi-wrapper
+        .b-button__text Загрузить файлы
+        %input.b-button__input.js-fileapi{:name => "files", :type => "file",  :multiple => true, data: {"upload-url" => url_for([:admin, Redde::Photo])}}
 
-    = form_for [:admin, parent.photos.build], html: { class: 'photos-uploader js-photos-uploader' } do |f|
-      = f.hidden_field :imageable_type
-      = f.hidden_field :imageable_id
-      %span.sbm.photos-uploader__btn.icon-upload
-        Загрузить
-        = f.file_field :src, class: 'photos-uploader__inp'
+  = form_for [:admin, parent.photos.build], html: { class: 'photos-uploader js-photos-uploader' } do |f|
+    = f.hidden_field :imageable_type
+    = f.hidden_field :imageable_id
+    %span.sbm.photos-uploader__btn.icon-upload
+      Загрузить
+      = f.file_field :src, class: 'photos-uploader__inp'

data/lib/generators/redde/scaffold/scaffold_generator.rb

@@ -97,7 +97,7 @@ module Redde
         when 'url' then 'Ссылка'
         when 'value' then 'Значение'
         when 'articul' then 'Артикул'
-        when 'guid' then '1С'
+        when 'guid' then 'GUID'
         when 'tag_list' then 'Тэги'
         when 'category_id' then 'Категория'
         when 'message' then 'Сообщение'

data/lib/redde/version.rb

@@ -1,3 +1,3 @@
 module Redde
-  VERSION = '0.3.23'.freeze
+  VERSION = '0.3.24'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redde
 version: !ruby/object:Gem::Version
-  version: 0.3.23
+  version: 0.3.24
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -510,7 +510,6 @@ files:
 - app/mailers/.keep
 - app/models/.keep
 - app/models/concerns/redde/layouts.rb
-- app/models/concerns/redde/photoable.rb
 - app/models/concerns/redde/sluggable.rb
 - app/models/concerns/redde/tree_sortable.rb
 - app/models/concerns/redde/with_photo.rb

data/app/models/concerns/redde/photoable.rb

@@ -1,5 +0,0 @@
-module Redde::Photoable
-  extend ActiveSupport::Concern
-
-
-end