lalala 4.0.0.dev.141 → 4.0.0.dev.144

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1379d942688aef052e35b4107cf17e41c99fc41
-  data.tar.gz: 4b5c0e1c6ec47d1e221c776e23f97db052c3ec8f
+  metadata.gz: 0989e5147006ca4a93807e9493b4b96db705a7e6
+  data.tar.gz: bae82384b59312d98d10092be22493224386d0dd
 SHA512:
-  metadata.gz: 34e395750300b8154477e4d3d5bb83297700df1ed2f83a6d5c9c9f1c2ea98787ea4a4e5fe62a865b9d23e33bf922f9df9dc0061d35147f47f0e3da5d77b7ab00
-  data.tar.gz: b20ff1388e6ffcdc110c6fc132d7baa55bf7b1f21dcc8fdf4912721a7a8ec21f4c33afe0ca281d3aa1dd32f368b959360324a56b931120adc033a82dab4fe33d
+  metadata.gz: 31b2c66904ff4037377e6fe471ace48055d710820ab4db61ae3867019b0d8f12b55e3563459c533dadd48ce183361a85874c7802c08809115b8c24c8b2a2a153
+  data.tar.gz: c64a1efd5ed6a24c04e0de01ebfc1333110c41aef3384838a85470af449e398050b539cfb560e6a8a957e92543aa6c1459211dfec915c09386c3f663b593cc91

data/lalala.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://mrhenry.be"
 
   gem.files = `git ls-files`.split($/).reject{ |f| /^vendor\/deps/ === f }
-  gem.files += `cd vendor/deps/active_admin ; git ls-files`.split($/).map { |f| "vendor/deps/active_admin/#{f}" }
 
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
@@ -45,16 +44,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'i18n-country-translations', '= 0.0.9'
   gem.add_runtime_dependency 'dalli',                     '= 2.6.3'
   gem.add_runtime_dependency 'closure_tree',              '= 3.10.2'
-
-  # vendor/deps/active_admin
-  # gem.add_runtime_dependency 'activeadmin',  '= 0.5.1'
-  gem.add_runtime_dependency "arbre",               ">= 1.0.1"
-  gem.add_runtime_dependency "bourbon",             ">= 1.0.0"
-  gem.add_runtime_dependency "devise",              ">= 1.1.2"
-  gem.add_runtime_dependency "fastercsv",           ">= 0"
-  gem.add_runtime_dependency "formtastic",          ">= 2.0.0"
-  gem.add_runtime_dependency "inherited_resources", ">= 1.3.1"
-  gem.add_runtime_dependency "kaminari",            ">= 0.13.0"
-  gem.add_runtime_dependency "meta_search",         ">= 0.9.2"
+  gem.add_runtime_dependency 'activeadmin',               '= 0.6.0'
 
 end

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "141"
+  BUILD   = "144"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

data/lib/lalala/views/index_as_tree_table.rb

@@ -99,9 +99,9 @@ module ActiveAdmin
 
       def build(page_presenter, collection)
         table_options = {
-          :id => active_admin_config.resource_name.plural,
-          :class => "index_table index",
-          :i18n => active_admin_config.resource_class,
+          :id    => "index_tree_table_#{active_admin_config.resource_name.plural}",
+          :class => "index_tree_table index_table index",
+          :i18n  => active_admin_config.resource_class,
         }
 
         table_options[:sortable] = false
@@ -131,6 +131,10 @@ module ActiveAdmin
         end
       end
 
+      def self.index_name
+        "tree_table"
+      end
+
       #
       # Extend the default ActiveAdmin::Views::TableFor with some
       # methods for quickly displaying items on the index page

data/lib/lalala.rb

@@ -12,8 +12,6 @@ module Lalala
 
   groups = Rails.groups(:assets => %w(development test)).map(&:to_sym)
 
-  Lalala::Vendor.enable('activeadmin', 'active_admin')
-
   require 'rails-i18n'
   require 'i18n-country-translations'
   require 'carrierwave'