rails_admin_comments 0.3.0.1 → 0.3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d90fe615ad69d325f71424c2ad579f76423a881
-  data.tar.gz: 85683c150ecc68dc40e2b59269d2a4363d428d79
+  metadata.gz: a36dd4a6de4e43c31df2e8a3df90110bc8494576
+  data.tar.gz: 1ab93822e030325d93fb86cbb1e17986b3484f80
 SHA512:
-  metadata.gz: ab71d47fb118d5856a7ef3d7004c6a357d7567cf9a026ad7cba411eb26faf8db6c6f87bbb179ff2ee6054d2e8dbf51cbeb23ffcc6bb23363ae9a1257bfe44b86
-  data.tar.gz: 4e861058af63dcd54b59996ff9307e972722abc70193ac0a83ca374c482f96626f902c5ea3e05e946d6b155e13684d6622d5e8fbdb60ed66933bd3bbf92e2e0f
+  metadata.gz: ffa516fda31315ab9ec95c9a0a6a4269c118234f8eba5b964c8bc66aae03a268b2516cb7c3bf461f4782af65d9b3cbbdeb46fc1386e5e1c0e637d1ae4e298833
+  data.tar.gz: cae1a290fa3a69150a15dd996aed76feb3ac9bd4e9f82cb7fd3b243b92b771eebecf375c58c0c67cf621311079a478f2303f3198ee62a9d83d7f24094495a10f

data/lib/rails_admin_comments.rb

@@ -5,6 +5,9 @@ require 'mongoid_userstamp'
 
 require "rails_admin_comments/engine"
 
+require 'rails_admin/config/actions'
+require 'rails_admin/config/model'
+
 require 'rails_admin_comments/configuration'
 
 require 'rails_admin/config/actions'

data/lib/rails_admin_comments/action.rb

@@ -34,9 +34,9 @@ module RailsAdmin
                 begin
                   if params['rails_admin_comments_comment'].present?
                     if params['rails_admin_comments_comment']['id'].present?
-                      @comment = @object.rails_admin_comments.find(params['rails_admin_comments_comment']['id'])
+                      @comment = @object.rails_admin_comments.where(id: params['rails_admin_comments_comment']['id']).first
                     end
-                    @comment = @object.rails_admin_comments.new if @comment.nil?
+                    @comment ||= @object.rails_admin_comments.new
 
                     @comment.content = params['rails_admin_comments_comment']['content']
                     @comment.visible_for_user_ids = params['rails_admin_comments_comment']['visible_for_user_ids']
@@ -61,8 +61,24 @@ module RailsAdmin
                   @message = "<strong class='error'>#{I18n.t('admin.actions.comments.error')}</strong>: #{e}".freeze
                 end
 
+                @comments = @object.rails_admin_comments.by_date.enabled.for_user(current_user) || []
+                render action: @action.template_name
+
+              elsif request.delete?
+                if params['rails_admin_comments_comment']['id'].present?
+                  @comment = @object.rails_admin_comments.where(id: params['rails_admin_comments_comment']['id']).first
+                end
+                if @comment and @comment.destroy
+                  @comment = nil
+                  @message = "<strong class='success'>Удалено</strong>".freeze
+                else
+                  @message = "<strong class='error'>Удаление не удалось</strong>".freeze
+                end
+
+                @comments = @object.rails_admin_comments.by_date.enabled.for_user(current_user) || []
                 render action: @action.template_name
               end
+
             end
           end
         end
@@ -111,7 +127,7 @@ module RailsAdmin
               begin
                 if params['rails_admin_comments_model_comment'].present?
                   if params['rails_admin_comments_model_comment']['id'].present?
-                    @comment = @model.rails_admin_model_comments.find(params['rails_admin_comments_model_comment']['id'])
+                    @comment = @model.rails_admin_model_comments.where(id: params['rails_admin_comments_model_comment']['id']).first
                   end
                   @comment ||= @model.rails_admin_model_comments.new
 
@@ -138,18 +154,21 @@ module RailsAdmin
                 @message = "<strong class='error'>#{I18n.t('admin.actions.comments.error')}</strong>: #{e}".freeze
               end
 
+              @comments = @object.rails_admin_comments.by_date.enabled.for_user(current_user) || []
               render action: @action.template_name
 
             elsif request.delete?
               if params['rails_admin_comments_model_comment']['id'].present?
-                @comment = @model.rails_admin_model_comments.find(params['rails_admin_comments_model_comment']['id'])
+                @comment = @model.rails_admin_model_comments.where(id: params['rails_admin_comments_model_comment']['id']).first
               end
               if @comment and @comment.destroy
                 @comment = nil
-                @message = "Удалено".freeze
+                @message = "<strong class='success'>Удалено</strong>".freeze
               else
-                @message = "Удаление не удалось".freeze
+                @message = "<strong class='error'>Удаление не удалось</strong>".freeze
               end
+
+              @comments = @model.rails_admin_model_comments.by_date.enabled.for_user(current_user) || []
               render action: @action.template_name
             end
           end

data/lib/rails_admin_comments/models/mongoid/comments.rb

@@ -21,7 +21,7 @@ module RailsAdminComments
 
         has_and_belongs_to_many :visible_for_users, class_name: "User", inverse_of: nil
         scope :for_user, ->(user) {
-          any_of({visible_for_user_ids: user}, {visible_for_user_ids: nil})
+          any_of({visible_for_user_ids: user}, {visible_for_user_ids: nil}, {visible_for_user_ids: []})
         }
       end
     end

data/lib/rails_admin_comments/models/mongoid/model_comments.rb

@@ -9,7 +9,7 @@ module RailsAdminComments
 
         field :model_name, type: String
 
-        store_in collection: "rails_admin_model_comments".freeze
+        store_in collection: "rails_admin_model_comments"
 
         field :enabled, type: ::Mongoid::VERSION.to_i < 4 ? Boolean : ::Mongoid::Boolean, default: true
         scope :enabled, -> { where(enabled: true) }
@@ -21,7 +21,7 @@ module RailsAdminComments
 
         has_and_belongs_to_many :visible_for_users, class_name: "User", inverse_of: nil
         scope :for_user, ->(user) {
-          any_of({visible_for_user_ids: user}, {visible_for_user_ids: nil})
+          any_of({visible_for_user_ids: user}, {visible_for_user_ids: nil}, {visible_for_user_ids: []})
         }
       end
     end

data/lib/rails_admin_comments/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminComments
-  VERSION = "0.3.0.1".freeze
+  VERSION = "0.3.0.3".freeze
 end

data/rails_admin_comments.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rails", '>= 5.0.0'
 
-  spec.add_dependency "rails_admin", '>= 1.0.0.rc'
+  spec.add_dependency "rails_admin", ['>= 1.0.0.rc', "< 2.0"]
   spec.add_dependency "mongoid", [">= 6.0.0.rc0", "< 7.0"]
-  spec.add_dependency "glebtv_mongoid_userstamp", '~> 0.6.1'
+  spec.add_dependency "glebtv_mongoid_userstamp", '~> 0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_comments
 version: !ruby/object:Gem::Version
-  version: 0.3.0.1
+  version: 0.3.0.3
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0.rc
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +69,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0.rc
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
 description: Comments for rails_admin
 email:
 - i43ack@gmail.com