enjoy_cms 0.4.0.4 → 0.4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d38e3d832559619dac7803f4d62c582ee29fa2b6
-  data.tar.gz: 6531465366ee1e683901de9bce7f99c24920780d
+  metadata.gz: e7a875f96cd3f0979334375b90a822d6da795fd8
+  data.tar.gz: 61b29499b40cb6da3fb76d986071437d6ef3820a
 SHA512:
-  metadata.gz: 67f012ab8602b16dbff85d6e62d08c9059d1bb2d06fb39d6b0054bdd907f75d1e9145471cd6e7d6f2705c9b509eab79b638b3a991d540eac6532ad34b94c4739
-  data.tar.gz: 27ded3c13d239cad28af3b3858caeef1cbb52e9f3d3a3e7ce1aac210f6a8a0aa86c067625976d35cb91eda962bea913995a099941f9f740e399358cbbf61698c
+  metadata.gz: 691effa0962a688b062e4234d99c34d6f1628421c86d5faebbbd9c900d069357488f36a911e9e9758e44ff44f859a39b8c0724797d78ce9f6e640e2158987ca3
+  data.tar.gz: ee13c9219748151350df6bc8c0d46062a8d7f5497a9fc97978096f17371b22c9315a0dfb8ac9380ecbc0af980f852b50bff45f436180af10e1c736b3e37d5e25

data/lib/enjoy/rails_admin_ext/{group_patch.rb → patches/enjoy_cms_group.rb}

@@ -1,3 +1,4 @@
+require 'rails_admin'
 module Enjoy::RailsAdminGroupPatch
   class << self
     def enjoy_cms_group(config, fields = {})
@@ -5,8 +6,11 @@ module Enjoy::RailsAdminGroupPatch
 
       if fields.is_a?(Array)
         fields.each do |_group|
-          config.group (_group[:name] || "") do
+          config.group (_group[:name] || :default) do
             active (_group[:active] || false)
+            label _group[:label] if _group[:label].present?
+            help _group[:help] if _group[:help].present?
+            weight _group[:weight] if _group[:weight].present?
             (_group[:fields] || {}).each_pair do |name, type|
               if type.blank?
                 field name

data/lib/enjoy/rails_admin_ext/patches/field_patch.rb

@@ -0,0 +1,14 @@
+require 'rails_admin'
+module RailsAdmin
+  module Config
+    module Fields
+
+      class Base
+        register_instance_option :weight do
+          name.to_sym == :default ? -1_000_000 : 0
+        end
+      end
+
+    end
+  end
+end

data/lib/enjoy/rails_admin_ext/patches/group_patch.rb

@@ -0,0 +1,41 @@
+require 'rails_admin'
+module RailsAdmin
+  module Config
+    module Fields
+
+      class Group
+        register_instance_option :weight do
+          name.to_sym == :default ? -1_000_000 : 0
+        end
+
+        def visible_fields
+          section.with(bindings).visible_fields.select { |f|
+            f.group == self
+          }.sort do |a, b|
+            a.weight <=> b.weight
+          end
+        end
+      end
+
+    end
+  end
+end
+
+module RailsAdmin
+  module Config
+    module HasGroups
+
+      def visible_groups
+        parent.groups.collect { |f|
+          f.section = self
+          f.with(bindings)
+        }.select(&:visible?).select { |g|
+          g.visible_fields.present?
+        }.sort do |a, b|
+          a.weight <=> b.weight
+        end
+      end
+
+    end
+  end
+end

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.4.0.4"
+  VERSION = "0.4.0.5"
 end

data/lib/enjoy_cms.rb

@@ -17,13 +17,19 @@ require 'geocoder'
 # require 'validates_email_format_of'
 require 'filename_to_slug'
 
+
 require 'rails_admin'
 require 'enjoy/rails_admin_ext/config'
 
 # require 'enjoy/rails_admin_ext/enjoy_hash'
 require 'enjoy/rails_admin_ext/enjoy_html'
 require 'enjoy/rails_admin_ext/enjoy_slugs'
-require 'enjoy/rails_admin_ext/group_patch'
+
+require 'enjoy/rails_admin_ext/patches/field_patch'
+require 'enjoy/rails_admin_ext/patches/field_patch'
+require 'enjoy/rails_admin_ext/patches/group_patch'
+require 'enjoy/rails_admin_ext/patches/enjoy_cms_group'
+
 
 require 'rails_admin_nested_set'
 require 'rails_admin_toggleable'

data/template.rb

@@ -327,15 +327,28 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
   end
 
   def self.generate_first_admin_user
-    if User.all.count == 0
+    if User.admins.all.count == 0
       _email_pass = 'admin@#{app_name.dasherize.downcase}.ru'
       if User.new(roles: ["admin"], email: _email_pass, password: _email_pass, password_confirmation: _email_pass).save
-        puts "User with email and password '\#{_email_pass}' was created!"
+        puts "AdminUser with email and password '\#{_email_pass}' was created!"
       else
-        puts 'Creating User error'
+        puts 'Creating AdminUser error'
       end
     else
-      puts 'Users are here already'
+      puts 'AdminUsers are here already'
+    end
+  end
+
+  def self.generate_first_manager_user
+    if User.managers.all.count == 0
+      _email_pass = 'manager@#{app_name.dasherize.downcase}.ru'
+      if User.create(roles: ["manager"], email: _email_pass, password: _email_pass, password_confirmation: _email_pass)
+        puts "ManagerUser with email and password '\#{_email_pass}' was created!"
+      else
+        puts 'Creating ManagerUser error'
+      end
+    else
+      puts 'ManagerUsers are here already'
     end
   end
 
@@ -483,12 +496,8 @@ generate "enjoy:cms:assets", app_name
 remove_file 'public/robots.txt'
 generate "enjoy:cms:robots"
 
-
 #god+unicorn
 generate "enjoy:cms:unicorn_god", app_name
-
-
-
 #scripts
 generate "enjoy:cms:scripts", app_name
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.4.0.4
+  version: 0.4.0.5
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -320,7 +320,9 @@ files:
 - lib/enjoy/rails_admin_ext/enjoy_hash.rb
 - lib/enjoy/rails_admin_ext/enjoy_html.rb
 - lib/enjoy/rails_admin_ext/enjoy_slugs.rb
-- lib/enjoy/rails_admin_ext/group_patch.rb
+- lib/enjoy/rails_admin_ext/patches/enjoy_cms_group.rb
+- lib/enjoy/rails_admin_ext/patches/field_patch.rb
+- lib/enjoy/rails_admin_ext/patches/group_patch.rb
 - lib/enjoy/rails_admin_settings_patch.rb
 - lib/enjoy/routes.rb
 - lib/enjoy/simple_form_patch.rb