rails_admin_comments 0.2.1 → 0.2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b37fde637a44126cead4d54ca515ad0d5fb49b1d
-  data.tar.gz: c3f4de022f3906cc51a8f3e2368e04386776342e
+  metadata.gz: dbb52f3399323450849acd32f11e7a2562f461f9
+  data.tar.gz: 09ee120d4f78bf3aae941b80a9249b75c03459bf
 SHA512:
-  metadata.gz: e61ef1d66be404209cbf0867157c85ecda9cf0587e1af2bc71e55394677ad69099e786a67cd279f0a0fff273d0d39610663408f8a70d55f3359b1e14930efbeb
-  data.tar.gz: 154268845acd71049b03f6f697fb8cec0f5449584b80e5870af130356e2b580fcd5f36be70b93b9647b0dda6e0c39fc39459a7def34b3169872e6fe925bd2c81
+  metadata.gz: e42990d510caaaa63a2878d00c48766483b9548c5819c47b3fd2953d102f87046f630b8ad54d824a515074c650dae9e3ef89707dbb6b0ff674f34602806a9a16
+  data.tar.gz: 696cb6d81aeab696556c68df1c2f92420ae0d7661c33b00cd7c64ac8a1040a6e90e96c45a24931f37bfce9abb19b28ee751f25c84978cd8bd17b1029acfd844d

data/app/views/rails_admin/main/model_comments.html.slim

@@ -20,9 +20,9 @@
             span.created_at= Russian::strftime c.c_at, "%d.%m.%Y в %H:%M:%S".freeze
             span.updated_at= " (изм. #{Russian::strftime c.u_at, "%d.%m.%Y в %H:%M:%S"})".freeze if Russian::strftime c.u_at
             - if creator == current_user or (current_user.respond_to?(:admin?) and current_user.admin?)
-              = link_to 'изменить', "##{edit_form_id}".freeze, class: 'comment_edit_form_link'.freeze
+              = link_to 'изменить'.freeze, "##{edit_form_id}".freeze, class: 'comment_edit_form_link'.freeze
               = " | " 
-              = link_to 'удалить', "##{edit_form_id}".freeze,  class: 'comment_delete_form_link'.freeze
+              = link_to 'удалить'.freeze, "##{edit_form_id}".freeze,  class: 'comment_delete_form_link'.freeze
             p.content_block= c.content
           p
             .comment_edit_form.hidden{id=edit_form_id}

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 = @model.rails_admin_model_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

@@ -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.2.1".freeze
+  VERSION = "0.2.3.2".freeze
 end

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/rails_admin_comments.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency "rails_admin", '~> 0.8.1'
-  spec.add_dependency "mongoid", [">= 5.0", "< 6.0"]
-  spec.add_dependency "glebtv_mongoid_userstamp", '~> 0.6.1'
+  spec.add_dependency "rails_admin", [">= 0.8.1", "< 1.1"]
+  spec.add_dependency "mongoid", [">= 5.0", "< 6.1"]
+  spec.add_dependency "glebtv_mongoid_userstamp", '>= 0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_comments
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3.2
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,22 @@ dependencies:
   name: rails_admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +67,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,21 +77,21 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: glebtv_mongoid_userstamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.6'
 description: Comments for rails_admin
 email:
 - i43ack@gmail.com