push_type_admin 0.5.3 → 0.6.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0f99fa649eb1e7f6d6bf92d72629fd8de90ad1e
-  data.tar.gz: 87900c39efef8fdbd70976088dafd7a7302e965d
+  metadata.gz: f93ae03dc6ed6fab62b7bbf7932077fdf4f379fa
+  data.tar.gz: 19f745c42c090f9dacae3b97bdcd157c2a9a3460
 SHA512:
-  metadata.gz: 20096eeca73b5389530ef1faebefff892aa730c285775a2a10744053cdfab39c643eeec346e216e12833698c26f667b8daeae8a4452105fc676142e010a6e2ec
-  data.tar.gz: 2cabde91d130df1d2926b1e66e3b142e1731bc74135434087a9d42924e7eb9dab644735cc92380a288ce3331026f34afc97094894f784588f857fae8b3a43a1e
+  metadata.gz: e74abb601ff2e6336e84ad7c6093da357d883687e7c564a455129ed9e0281113597ef066c52a2e61926d398c218b334f3eed5ebc740a0c4dd658acf2ffe5395a
+  data.tar.gz: 71989795eda90d361c7a33ec8a96be133a2c85b930da18d96f5d79a026714d261487116a3add425e0718ebcfdeacf8e689d59330c25752945edb7bcb439dc004

data/app/assets/javascripts/push_type/fields/relation_fields.js.coffee

@@ -1,7 +1,7 @@
 # jQuery init
 $(document).on 'ready page:load', ->
 
-  $('select', '.taxonomy, .node').selectize
+  $('select', '.relation, .node, .taxonomy').selectize
     plugins:      ['remove_button']
     hideSelected: false
     onInitialize: ->

data/app/assets/stylesheets/push_type/admin.scss

@@ -717,10 +717,6 @@ form .permalink {
   }
 }
 
-input[type="hidden"] + .error {
-  display: none;
-}
-
 .error-icon {
   display:              inline;
   font-size:            $form-label-font-size;
@@ -782,10 +778,23 @@ form .asset-upload {
   }
 }
 
-.asset-field {
+%field-module {
   margin:               rem-calc(0 0 16);
-  padding:              rem-calc(8);
   border:               1px solid $input-border-color;
+  .error small.error, &.error {
+    margin-bottom:      0;
+  }
+  label {
+    color: $form-label-font-color;
+  }
+  .error label {
+    color: $alert-color;
+  }
+}
+
+.asset-field {
+  @extend %field-module;
+  padding:              rem-calc(8);
   box-shadow:           $input-box-shadow;
 
   .preview {
@@ -794,15 +803,11 @@ form .asset-upload {
   .button {
     margin-top:         0;
     margin-bottom:      0;
-  }
-  &.error {
-    margin-bottom:      0;
-  }
+  } 
 }
 
 .repeater-field {
-  margin:               rem-calc(0 0 16);
-  border:               1px solid $input-border-color;
+  @extend %field-module;
 
   table {
     margin:             0;
@@ -818,7 +823,7 @@ form .asset-upload {
   .plus {
     padding: 0.5625rem 0.625rem;
   }
-  .button, input, select, textarea {
+  .button, input, select, textarea, label, .selectize-control, %field-module {
     margin:             0;
   }
   textarea {
@@ -843,6 +848,9 @@ form .asset-upload {
   .picker {
     margin-top: -#{ rem-calc(17) };
   }
+  .error .picker, .repeater-field & .picker {
+    margin-top: 0;
+  }
   .picker__footer {
     padding-bottom: 0.75em;
     button {

data/app/controllers/push_type/nodes_controller.rb

@@ -91,8 +91,9 @@ module PushType
     end
 
     def node_params
-      fields = [:title, :slug, :status, :published_at, :published_to] + @node.field_params
-      params.fetch(@node.type.underscore.to_sym, {}).permit(*fields)
+      params.fetch(@node.type.underscore.to_sym, {}).permit(:title, :slug, :status, :published_at, :published_to).tap do |whitelist|
+        @node.fields.keys.each { |k| whitelist[k] = params[@node.type.underscore.to_sym][k] if params[@node.type.underscore.to_sym].try(:[], k) }
+      end
     end
 
     def redirect_path(skip_trash = false)

data/app/helpers/push_type/admin_helper.rb

@@ -11,12 +11,5 @@ module PushType
       [el, label].compact.join(' ').html_safe
     end
 
-    def render_custom_field(field, form_builder)
-      classes = [ field.kind, field.column_class, 'columns end' ]
-      content_tag :div, class: classes.compact do
-        render "push_type/fields/#{ field.template }", f: form_builder, field: field
-      end
-    end
-
   end
 end

data/app/helpers/push_type/assets_helper.rb

@@ -6,6 +6,7 @@ module PushType
     end
 
     def asset_hash(asset)
+      return nil if asset.nil?
       hash = [ :id, :file_name, :file_size, :mime_type, :created_at, :new_record?, :image?, :description_or_file_name ].inject({}) do |h, att|
         h.update att => asset.send(att)
       end

data/app/helpers/push_type/fields_helper.rb

@@ -0,0 +1,41 @@
+module PushType
+  module FieldsHelper
+
+    def render_field(field, f)
+      content_tag :div, class: field.kind do
+        render "push_type/fields/#{ field.template }", f: f, field: field
+      end
+    end
+
+    def field_classes(field)
+      [field.css_class, 'columns end'].compact.join(' ')
+    end
+
+    def merge_repeater_html_options(object_name, field, sub_field)
+      opts = {
+        name: "#{ object_name }[#{ field.name }][]",
+        id:   "#{ object_name }_#{ field.name }_{{ $index }}"
+      }
+      if [:text_area, :select].include?(sub_field.form_helper)
+        opts.merge!(:'ng-model' => "rows[$index]")
+      else
+        opts.merge!(:'ng-value' => "rows[$index]")
+      end
+      sub_field.instance_variable_get(:@opts)[:html_options].merge! opts
+    end
+
+    def merge_matrix_html_options(object_name, field, sub_field)
+      opts = {
+        name:   "#{ object_name }[#{ field.name }][][#{ sub_field.name }]",
+        id:     "#{ object_name }_#{ field.name }_{{ $index }}_#{ sub_field.name }"
+      }
+      if [:text_area, :select].include?(sub_field.form_helper)
+        opts.merge!(:'ng-model' => "row.#{ sub_field.name }")
+      else
+        opts.merge!(:'ng-value' => "row.#{ sub_field.name }")
+      end
+      sub_field.instance_variable_get(:@opts)[:html_options].merge! opts
+    end
+
+  end
+end

data/app/views/push_type/fields/_asset.html.haml

@@ -1,7 +1,5 @@
-= f.label field.json_key, field.label
-
-.asset-field{ class: ('error' if f.object.errors[field.json_key].present?), ng: { controller: 'AssetFieldCtrl', init: "assetsPath='#{ push_type.assets_path }'; asset=#{ f.object.send(field.name.to_sym) ? asset_hash(f.object.send(field.name.to_sym)).to_json : 'null' }" } }
-  = f.hidden_field field.json_key, value: '{{ asset.id }}'
+.asset-field{ class: ('error' if f.object.errors[field.name].present?), ng: { controller: 'AssetFieldCtrl', init: "assetsPath='#{ push_type.assets_path }'; asset=#{ asset_hash(f.object.send(field.relation_name.to_sym)).to_json }" } }
+  = f.hidden_field field.name, value: '{{ asset.id }}'
 
   .row{ ng: { show: 'asset' } }
     .small-4.medium-3.columns
@@ -47,6 +45,6 @@
             .prompt Drag files to quickly upload them…
             .icon= ficon(:upload_cloud)
 
-- if f.object.errors[field.json_key].present?
-  %small.error= f.object.errors[field.json_key].join(', ')
+- if f.object.errors[field.name].present?
+  %small.error= f.object.errors[field.name].join(', ')
 

data/app/views/push_type/fields/_date.html.haml

@@ -1,2 +1 @@
-= f.label field.json_key, field.label
-= f.send field.form_helper, field.json_key, field.html_options.merge(data: { value: f.object.field_store[field.name] })
+= f.send field.form_helper, field.name, field.html_options.merge(data: { value: field.json_value })

data/app/views/push_type/fields/_default.html.haml

@@ -1,2 +1 @@
-= f.label field.json_key, field.label
-= f.send field.form_helper, field.json_key, field.html_options
+= f.send field.form_helper, field.name, field.html_options

data/app/views/push_type/fields/_matrix.html.haml

@@ -1,17 +1,17 @@
-= f.label field.json_key, field.label
-
-.repeater-field{ ng: { controller: 'MatrixFieldCtrl', init: "initRows(#{ f.object.send(field.json_key).to_json })" } }
+.repeater-field{ ng: { controller: 'MatrixFieldCtrl', init: "initRows(#{ field.json_value.to_json })" } }
   %table
     %thead
       %tr
-        - field.mapping.keys.each do |key|
-          %th= key.to_s.humanize
+        - field.fields.keys.each do |name|
+          %th= name.to_s.humanize
         %th  
     %tbody
       %tr{ ng: { repeat: 'row in rows track by $index' } }
-        - field.mapping.each do |key, form_helper|
-          %td= f.send form_helper, nil, field.html_options.merge(name: "#{ f.object_name }[#{ field.json_key }][][#{ key }]", id: "#{ f.object_name }_#{ field.json_key }_{{ $index }}_#{ key }", value: nil, :'ng-model' => "row.#{ key }")
-        %td.remove
-          %a.alert{ ng: { click: 'removeRow($index)' } }= ficon(:x)
+        = fields_for :matrix do |m|
+          - field.fields.each do |name, sub_field|
+            - merge_matrix_html_options f.object_name, field, sub_field
+            %td= render_field sub_field, m
+          %td.remove
+            %a.alert{ ng: { click: 'removeRow($index)' } }= ficon(:x)
   .plus
     %a.button.success.tiny.radius{ ng: { click: 'addRow()' } }= ficon :plus, 'Add row'

data/app/views/push_type/fields/_relation.html.haml

@@ -1,2 +1 @@
-= f.label field.json_key, field.label
-= f.select field.json_key, [], field.field_options, field.html_options.merge(data: { options: field.relation_tree.to_json, items: f.object.send(field.json_key) })
+= f.select field.name, [], field.field_options, field.html_options.merge(data: { options: field.choices.to_json, items: field.json_value })

data/app/views/push_type/fields/_repeater.html.haml

@@ -1,11 +1,12 @@
-= f.label field.json_key, field.label
-
-.repeater-field{ ng: { controller: 'RepeaterFieldCtrl', init: "initRows(#{ f.object.send(field.json_key).to_json })" } }
+.repeater-field{ ng: { controller: 'RepeaterFieldCtrl', init: "initRows(#{ field.json_value.to_json })" } }
   %table
     %tbody
       %tr{ ng: { repeat: 'row in rows track by $index' } }
-        %td= f.send field.form_helper, nil, field.html_options.merge(name: "#{ f.object_name }[#{ field.json_key }][]", id: "#{ f.object_name }_#{ field.json_key }_{{ $index }}", value: nil, :'ng-model' => 'rows[$index]')
-        %td.remove
-          %a.alert{ ng: { click: 'removeRow($index)' } }= ficon(:x)
+        = f.fields_for field.name do |m|
+          %td
+            - merge_repeater_html_options f.object_name, field, field.field
+            = render_field field.field, m
+          %td.remove
+            %a.alert{ ng: { click: 'removeRow($index)' } }= ficon(:x)
   .plus
     %a.button.success.tiny.radius{ ng: { click: 'addRow()' } }= ficon :plus, 'Add row'

data/app/views/push_type/fields/_select.html.haml

@@ -1,2 +1 @@
-= f.label field.json_key, field.label
-= f.select field.json_key, field.choices, field.field_options, field.html_options
+= f.select field.name, field.choices, field.field_options, field.html_options

data/app/views/push_type/fields/_structure.html.haml

@@ -0,0 +1,11 @@
+.repeater-field{ class: ('error' if f.object.errors[field.name].present?) }
+  %table
+    %tbody
+      = f.fields_for field.name, field.value do |s|
+        - field.fields.each do |key, sub_field|
+          %tr
+            %th= s.label sub_field.name, sub_field.label
+            %td= render_field sub_field, s
+
+- if f.object.errors[field.name].present?
+  %small.error= f.object.errors[field.name].join(', ')

data/app/views/push_type/fields/_tag_list.html.haml

@@ -1,3 +1 @@
-= f.label field.json_key, field.label
-= f.select field.json_key, f.object.send(field.json_key), {}, field.html_options
-
+= f.select field.name, field.choices, {}, field.html_options

data/app/views/push_type/nodes/_form_fields.html.haml

@@ -26,7 +26,9 @@
 
           .row.custom-fields
             - @node.fields.each do |key, field|
-              = render_custom_field field, f
+              %div{ class: field_classes(field) }
+                = f.label field.name, field.label
+                = render_field field, f
 
     .large-4.columns
       .side-panel{ :'side-panel' => true }

data/app/views/push_type/users/_form.html.haml

@@ -16,7 +16,9 @@
 
         .row.custom-fields
           - @user.fields.each do |key, field|
-            = render_custom_field field, f
+            %div{ class: field_classes(field) }
+              = f.label field.name, field.label
+              = render_field field, f
 
   .large-4.columns
     .side-panel{ :'side-panel' => true }

data/test/dummy/config/initializers/push_type.rb

@@ -50,6 +50,6 @@ PushType.setup do |config|
   #   secret_access_key:  ENV['SECRET_ACCESS_KEY_ID']
   # }
 
-  # config.dragonfly_secret = 'c57cfbb21621a5ebc5d737576cc6db912025df3614cafe508b9225316349925d'
+  # config.dragonfly_secret = '2542d62d66fa7ca4238bb61e6f4dfcd1a0234b025752343ee31f606926ec829e'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 90a8c1d20ca50e112c7d6ed7b2843e03831458402ca2f4f4f4f87b4fa6a16a609e0bd92dc0a556e79e0ed84d6152692fd1fcde9501783eced501d837657ba867
+  secret_key_base: 082dfbae4ce05ff87db8dc7406a2ab20ecb6a191996319e045568be651276c49bf0d5b90552a812e7cd73fa131f4d58890248602378520e174710ac788052db5
 
 test:
-  secret_key_base: 54926a80c4d0e8e829ccd26fb5358064fe1f77f8f5b5b6cf836ef1457436fe1e6820f03bf5be89b316096e572b34beaf88f3b393b84f6767227fa69f4a5773a8
+  secret_key_base: c305599cd12060dcffe2fedee9935d508e193115b6c91f0a6217b191c014c1dd9254a5d30944cb98be2b985d097b1fbe25d3edfdbc3a342c8fe459647cb548b3
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150928114721) do
+ActiveRecord::Schema.define(version: 20151015181718) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"