admin_it 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23227402f984ba9bcd6dd0f25a801b7171acef22
-  data.tar.gz: ad8ef38ebb8836aa18461a5c0c52396902135536
+  metadata.gz: e96e6d9fe0799703b334eb063cf44a1ee7498ae0
+  data.tar.gz: 2d67207520e2cf2cdad5409a96711587b63abdb6
 SHA512:
-  metadata.gz: ef40e89deeb37e124babee26cf47415d466d9f0d48b5d747380c3c08315bff0c7e40a6ee27aceb67cac817c3ba7b6dc35d58009aefefd0255f68ae86920c4fe7
-  data.tar.gz: eb042138351ebab7c1b9b12c3139c133b53438739a140dbbaf043ee9e55137516acc1343ed18e2ebfba4cbd012a362aa8d118b9ac6a4fcb248bf8ee9432fb14f
+  metadata.gz: ef9256ae9ff7ac5710c74fdbad74a401c72d1fa0c6b45942869cef6bf1e4fce353ca393ebe574d71cda077fa1525b75162869b57af8d5b8a37effb104aefa66b
+  data.tar.gz: 9638a3aef76d5b3f5a24d1463c08f60049dfc2e17b5a3402c37d4d531073e82cc893badb83a1ca1cf168bc11a30bc9760a0e115ec658f570373460d965b9571f

data/README.md

@@ -36,6 +36,12 @@ bundle install
 
 # Changes
 
+`1.2.2`
+* added: select2 fields
+
+`1.2.1`
+* added: nested models support
+
 `1.2.0`
 * added: partials for fields
 * updated: FontAwesome to `4.1.0`

data/admin_it.gemspec

@@ -9,25 +9,25 @@ Gem::Specification.new do |spec|
   spec.version       = AdminIt::VERSION
   spec.authors       = ['Alexey Ovchinnikov']
   spec.email         = ['alexiss@cybernetlab.ru']
-  spec.description   = %q{Admin interface}
-  spec.summary       = %q{Admin interface}
+  spec.description   = %q(Admin interface)
+  spec.summary       = %q(Admin interface)
   spec.homepage      = 'https://github.com/cybernetlab/admin_it'
   spec.license       = 'MIT'
   spec.metadata      = {
     'issue_tracker' => 'https://github.com/cybernetlab/admin_it/issues'
   }
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'sprockets'
   spec.add_dependency 'rails', '~> 4.0'
   spec.add_dependency 'devise'
   spec.add_dependency 'wrap_it'
   spec.add_dependency 'ensure_it'
   spec.add_dependency 'aws-sdk'
+  spec.add_dependency 'select2-rails'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'sqlite3'

data/app/assets/javascript/admin_it/admin_it.js

@@ -120,6 +120,12 @@ var initImageUploads = function() {
   });
 }
 
+var initSelects = function() {
+  $('.select2:not(.select2-container)').select2({
+    minimumResultsForSearch: -1 // disable search
+  });
+}
+
 $(document).on('ready page:load', function() {
   initPartials();
   // initDialogs();
@@ -128,6 +134,7 @@ $(document).on('ready page:load', function() {
   initPopups();
   initLinks();
   initImageUploads();
+  initSelects();
   // allow dialog content reloading
   $('.modal').on('hidden.bs.modal', function() { $(this).removeData(); })
              .on('loaded.bs.modal', function() {
@@ -144,5 +151,6 @@ $(document).on('ready page:load', function() {
                  });
                }
                initImageUploads();
+               initSelects();
              })
 });

data/app/assets/javascript/admin_it/index.js

@@ -5,4 +5,5 @@
 //= require admin_it/jquery.fileupload
 //= require admin_it/jquery.fileupload-ui
 //= require admin_it/jquery.fileupload-process
+//= require select2
 //= require admin_it/admin_it

data/app/assets/stylesheets/admin_it/index.css

@@ -3,5 +3,6 @@
  *= require admin_it/font-awesome.min
  *= require admin_it/jquery.fileupload
  *= require admin_it/jquery.fileupload-ui
+ *= require select2
  *= require admin_it/admin_it
  */

data/app/views/admin_it/editors/_combo.html.slim

@@ -0,0 +1,11 @@
+- for_context ||= context
+- name ||= "#{for_context.resource.name}[#{field.name}]"
+- id ||= "#{for_context.resource.name}_#{field.name}"
+- value ||= field.read(for_context.entity)
+- options = for_context.entity.class.enumerized_attributes[field.name].options
+- opts = { name: name, id: id }
+
+select.select2 *opts
+  - options.each do |option|
+    - selected = option[1] == value ? { selected: 'selected' } : {}
+    option value=option[1] *selected = option[0]

data/lib/admin_it/data/active_record/field.rb

@@ -46,11 +46,13 @@ module AdminIt
               I18n.t('admin_it.collection.no_data')
             else
               v = context.read(value.first)
-              v.nil? ? '' : context.read(value.first) + ' ...'
+              v.nil? ? '' : v + ' ...'
             end
           else
             context.read(value)
           end
+        elsif type == :enum
+          value.text
         else
           value
         end

data/lib/admin_it/data/active_record/single_context.rb

@@ -9,9 +9,8 @@ module AdminIt
         entity = entity_class.find(identity)
         controller.authorize(entity, "#{name}?") if AdminIt::Env.pundit?
         if child?
-          fields
-            .select { |f| f.type == :relation &&
-                          f.assoc.klass == parent.entity_class }
+          fields(scope: :relation)
+            .select { |f| f.assoc.klass == parent.entity_class }
             .each do |f|
               if f.assoc.collection?
                 entity.send(f.name) << parent.entity
@@ -53,9 +52,8 @@ module AdminIt
       def self.included(base)
         base.after_initialize do
           if child?
-            fields
-              .select { |f| f.type == :relation &&
-                            f.assoc.klass == parent.entity_class }
+            fields(scope: :relation)
+              .select { |f| f.assoc.klass == parent.entity_class }
               .each do |f|
                 if f.assoc.collection?
                   entity.send(f.name) << parent.entity

data/lib/admin_it/field/field.rb

@@ -113,7 +113,10 @@ module AdminIt
     end
 
     def self.editor
-      @editor ||= EDITORS[0]
+      return @editor unless @editor.nil?
+      return @editor = :image if type == :image
+      return @editor = :combo if type == :enum
+      @editor = EDITORS[0]
     end
 
     class_attr_reader :entity_class, :display_name, :type, :partial, :editor
@@ -212,7 +215,11 @@ module AdminIt
     end
 
     def show_value(entity)
-      read_value(entity)
+      if type == :enum
+        entity.send(name).text
+      else
+        read_value(entity)
+      end
     end
 
     def write_value(entity, value)

data/lib/admin_it/version.rb

@@ -1,5 +1,5 @@
 #
 module AdminIt
   # Current gem version
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: admin_it
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Alexey Ovchinnikov
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: select2-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -266,6 +266,7 @@ files:
 - app/views/admin_it/context/_table.html.slim
 - app/views/admin_it/context/_tiles.html.slim
 - app/views/admin_it/edit.html.slim
+- app/views/admin_it/editors/_combo.html.slim
 - app/views/admin_it/editors/_hidden.html.slim
 - app/views/admin_it/editors/_image.html.slim
 - app/views/admin_it/editors/_text.html.slim