rails_admin_json_editor 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 044a05b13bf7ef1de3de2554c352b192643acaef
-  data.tar.gz: 26ccfa525f5dca5e3f1d2a06bc80599c03212bf7
+  metadata.gz: 0aa4afd9f01c476433ebae3221d370a416dc649e
+  data.tar.gz: 5dad5a0d49dfc8a562b5681dc8d07a4b351651be
 SHA512:
-  metadata.gz: 5ce78613ba4364d1212970ffc8e633d16a69c7736333cf965de72272551025c6cb7fa941a2c5f6f1e699cfc707502e7d688c50ab1b20906d3e837dc65899bfdb
-  data.tar.gz: 166f73977a13fe90d85cfe0ddcd5ee1097cdab5ca05a582e78028aaec2d4b9676ea8dc695153eee30a4d26ba2c6efc46e1e949182d24d64a530fd0b79733c0e0
+  metadata.gz: 547b6cc3da9459664881963d7941c0ee704c4b1cc4a29debfae5b4f4f58d044f96b3f3ffe6da3dedb3c6de09723c87c314e3b000f7368a9524a7ebebda2b74a4
+  data.tar.gz: f7ea15755b4baa12c8923a38f79b17dd8e97457f83c2fe3e47094f8dc9cc74537b6fefbf4338e221bc7e8743722a03524d08ff452e390210ddd0ef191997042a

data/app/assets/javascripts/rails_admin_json_editor/rails_admin_json_editor.js

@@ -16,7 +16,7 @@ $(document).on('rails_admin.dom_ready', function() {
   }
 
   Vue.filter('markdown', function(value) {
-    return markdown.toHTML(value);
+    return value ? markdown.toHTML(value) : '';
   });
 
   // Setup templates for models

data/app/views/rails_admin_json_editor/main/_form_json_editor.html.erb

@@ -65,13 +65,17 @@
                   <input type="checkbox" v-model="component.properties.<%= f.name %>" class="form-control">
                 <% end %>
 
+                <% if f.type == :enum %>
+                  <%= select_tag(nil, options_for_select(f.enum_options), include_blank: true, class: "form-control", "v-model" => "component.properties.#{f.name}") %>
+                <% end %>
+
                 <% if f.type == :picker %>
                   <select v-on="change: onChangePicker($event, '<%= f.name %>')" class="form-control record-picker">
                     <option value=""></option>
                     <%
-                      records = Rails.cache.fetch("record-picker-#{f.picker_model_name}") {
+                      records = Rails.cache.fetch("record-picker-#{f.picker_model_name}") do
                         f.picker_model_name.constantize.send(:all)
-                      }
+                      end
                     %>
                     <% records.each do |record| %>
                       <option
@@ -92,32 +96,34 @@
                     </div>
                   </div>
 
-                  <!-- Add nested component -- one model allowed -->
-                  <% if f.list_model_names.count == 1 %>
-                    <a href="#"
-                      class="btn btn-info"
-                      v-repeat="model: $root.scheme.models"
-                      v-show="nestedModelIsAllowed(model, <%= f.list_model_names %>)"
-                      v-on="click: addComponent($event, '<%= f.name %>', model)">
-                        Add {{ model.label | lowercase }}
-                    </a>
-                  <% end %>
-
-                  <!-- Add nested component -- multiple models allowed -->
-                  <% if f.list_model_names.count > 1 %>
-                    <div class="dropdown">
-                      <a class="dropdown-toggle btn btn-info" data-toggle="dropdown" href="#">Add component <b class="caret"></b></a>
-                      <ul class="dropdown-menu">
-                        <li v-repeat="model: $root.scheme.models">
-                          <a href="#"
-                            v-if="nestedModelIsAllowed(model, <%= f.list_model_names %>)"
-                            v-on="click: addComponent($event, '<%= f.name %>', model)">
-                              {{ model.label }}
-                          </a>
-                        </li>
-                      </ul>
-                    </div>
-                  <% end %>
+                  <div v-show="!component.properties.<%= f.name %> || component.properties.<%= f.name %>.length < <%= f.list_max_length.nil? ? 999999 : f.list_max_length %>">
+                    <!-- Add nested component -- one model allowed -->
+                    <% if f.list_model_names.count == 1 %>
+                      <a href="#"
+                        class="btn btn-info"
+                        v-repeat="model: $root.scheme.models"
+                        v-show="nestedModelIsAllowed(model, <%= f.list_model_names %>)"
+                        v-on="click: addComponent($event, '<%= f.name %>', model)">
+                          Add {{ model.label | lowercase }}
+                      </a>
+                    <% end %>
+
+                    <!-- Add nested component -- multiple models allowed -->
+                    <% if f.list_model_names.count > 1 %>
+                      <div class="dropdown">
+                        <a class="dropdown-toggle btn btn-info" data-toggle="dropdown" href="#">Add component <b class="caret"></b></a>
+                        <ul class="dropdown-menu">
+                          <li v-repeat="model: $root.scheme.models">
+                            <a href="#"
+                              v-if="nestedModelIsAllowed(model, <%= f.list_model_names %>)"
+                              v-on="click: addComponent($event, '<%= f.name %>', model)">
+                                {{ model.label }}
+                            </a>
+                          </li>
+                        </ul>
+                      </div>
+                    <% end %>
+                  </div>
                 <% end %>
 
                 <%= content_tag :p, f.help, class: "help-block" unless f.help.nil? %>

data/lib/rails_admin_json_editor.rb

@@ -74,7 +74,10 @@ module RailsAdmin
             attr_accessor :picker_label,
                           :picker_model_name
 
-            attr_accessor :list_model_names
+            attr_accessor :list_model_names,
+                          :list_max_length
+
+            attr_accessor :enum_options
 
             def initialize(name, type, options = {})
               @name = name
@@ -99,8 +102,13 @@ module RailsAdmin
               @picker_model_name = options[:model].name
             end
 
-            def list(models)
+            def list(models, options = {})
               @list_model_names = Array(models).map { |m| m.name.gsub("::","___") }
+              @list_max_length = options[:max_length]
+            end
+
+            def enum(options)
+              @enum_options = options
             end
           end
         end

data/lib/rails_admin_json_editor/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminJsonEditor
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_json_editor
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Jasper Haggenburg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler