enjoy_cms 0.3.1.2 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 450bfca66a304970d20076882809a8d12036c27d
-  data.tar.gz: 497f597e35f6e549d6305aaadf9615663517e5ab
+  metadata.gz: e33a4e7ad3766cc568450aa9727d67007767e578
+  data.tar.gz: 5b1163592a2342e6909390363095a0cd94766e8a
 SHA512:
-  metadata.gz: a8a60ec96ee9702d5f936a7d04cdff907c20931a82a9e4114076ee037cdc2872e7499a4903f865a0fbd4be5271e2480ada7cfde7806b43b44084e9194ffeaac4
-  data.tar.gz: 4392affe4373c6ce16b5a49a4b308651f900b0c907e46565cdeaa7c99535662c693c14531abe37084cbe22a8766784f1089b587389562fd134f36f37fd46c957
+  metadata.gz: 716b95fed34f32026ebe624807e5fca67c89e94dbc58fe4cf46ee1f29cc93576f0cfb63879989216e240073502605df41f2095baeb06aee772747471bda3593a
+  data.tar.gz: 2c89eea1c204394f1bc0321e830bde1936bca3e274fae3c31145799d2deed2b7441641ab490e45fb89fa46a63c948930552ead100ebbee82a3b2bd41b5cb306a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.3.1.2)
+    enjoy_cms (0.3.2)
       ack_rails_admin_jcrop
       addressable
       ckeditor

data/lib/enjoy/admin/gallery.rb

@@ -7,18 +7,21 @@ module Enjoy
           field :enabled, :toggle
 
           field :name, :string
-          field :slugs, :enum do
-            enum_method do
-              :slugs
-            end
-            visible do
-              bindings[:view].current_user.admin?
-            end
-            multiple do
-              true
+          group :URL do
+            active false
+            field :slugs, :enum do
+              enum_method do
+                :slugs
+              end
+              visible do
+                bindings[:view].current_user.admin?
+              end
+              multiple do
+                true
+              end
             end
+            field :text_slug
           end
-          field :text_slug
 
           field :image, :jcrop do
             jcrop_options :image_jcrop_options

data/lib/enjoy/admin/news.rb

@@ -18,30 +18,39 @@ module Enjoy
               jcrop_options :image_jcrop_options
             end
           end
-          field :excerpt, :enjoy_html
-          # field :excerpt_html, :ck_editor
-          # field :excerpt_clear, :toggle
-          field :slugs, :enum do
-            enum_method do
-              :slugs
-            end
-            visible do
-              bindings[:view].current_user.admin?
-            end
-            multiple do
-              true
+          group :content do
+            active false
+            field :excerpt, :enjoy_html
+            # field :excerpt_html, :ck_editor
+            # field :excerpt_clear, :toggle
+          end
+          group :URL do
+            active false
+            field :slugs, :enum do
+              enum_method do
+                :slugs
+              end
+              visible do
+                bindings[:view].current_user.admin?
+              end
+              multiple do
+                true
+              end
             end
+            field :text_slug
           end
-          field :text_slug
 
           list do
             sort_by :time
           end
 
           edit do
-            field :content, :enjoy_html
-            # field :content_html, :ck_editor
-            # field :content_clear, :toggle
+            group :text do
+              active false
+              field :content, :enjoy_html
+              # field :content_html, :ck_editor
+              # field :content_clear, :toggle
+            end
             fields.each_pair do |name, type|
               if type.nil?
                 field name

data/lib/enjoy/admin/page.rb

@@ -21,14 +21,19 @@ module Enjoy
 
           edit do
             field :name
-            field :excerpt, :enjoy_html
-            # field :excerpt_html, :ck_editor
-            # field :excerpt_clear, :toggle
-            field :content, :enjoy_html
-            # field :content_html, :ck_editor
-            # field :content_clear, :toggle
+
+            group :content do
+              active false
+              field :excerpt, :enjoy_html
+              # field :excerpt_html, :ck_editor
+              # field :excerpt_clear, :toggle
+              field :content, :enjoy_html
+              # field :content_html, :ck_editor
+              # field :content_clear, :toggle
+            end
 
             group :menu do
+              active false
               label I18n.t('enjoy.menu')
               field :menus
               field :fullpath, :string do

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.3.1.2"
+  VERSION = "0.3.2"
 end

data/lib/generators/enjoy/templates/ability.erb

@@ -7,6 +7,8 @@ class Ability
       can :access, :rails_admin   # grant access to rails_admin
       can :dashboard              # grant access to the dashboard
 
+      can :comments, :all         #RailsAdminComments
+
       if user.admin?
         admin_ui(user)
       elsif user.manager?
@@ -40,7 +42,7 @@ class Ability
     [
       Enjoy::Page, Enjoy::News,
       Enjoy::Seo, Enjoy::SitemapData,
-      RailsAdminSettings::Settings
+      RailsAdminSettings::Setting
     ]
   end
 end

data/template.rb

@@ -406,7 +406,7 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
     edit do
       field :email, :string do
         visible do
-          bindings[:controller].current_user.admin? or (bindings[:controller].current_user.manager? bindings[:controller].current_user == bindings[:object])
+          bindings[:controller].current_user.admin? or (bindings[:controller].current_user.manager? and bindings[:controller].current_user == bindings[:object])
         end
       end
       field :name, :string

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.1.2
+  version: 0.3.2
 platform: ruby
 authors:
 - Alexander Kiseliev