foreman_datacenter 0.1.36 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db1cc96b60f64e415c59d84afe0d3156992b2338
-  data.tar.gz: fa207733005d350e4a2d23f3f5941d324645a7a9
+  metadata.gz: 6b851bab3120b7c4df74cb7ce12aeeed27688047
+  data.tar.gz: 72c137e7e300c640f898e21beaa690a1b556c345
 SHA512:
-  metadata.gz: 84ade058da8490f5a9acb57faf7cae8f963475f87b38e0f0a7eb3c837470f4e29842a52aa6541ab2751b5f093b74dbf50016451d1be618c6ed48848c69929a84
-  data.tar.gz: 2e7645d8ceaed125d5ae05e46e43101cc01c506322d419bba6586a40e8c906ae97c4a1dcf8015e15c2b61899c8210a72439f66647a456a633219cefb0c6ab487
+  metadata.gz: 990fa58e3d5fcd8f37b02f3600636f48ba13154ebc296d958cab91d973a665c88817716f814a9bd427ac524d2d174a219cd7ec338bbb2351efd253809054f01b
+  data.tar.gz: 6260c29af8dfd26be3d004f5cfa010d793db5f8860dad31e8ed108da387282f9d078957c1179b1c9070ff7362060819064d63b9db8977db5abefe4a95264b7fa

data/app/assets/stylesheets/foreman_datacenter/comments.css

@@ -4,3 +4,8 @@ ul.none-list {
   margin-top: 5px !important;
 }
 
+ul.none-list-child {
+  list-style-type: none !important;
+  padding-left: 15px !important;
+  margin-top: 5px !important;
+}

data/app/controllers/foreman_datacenter/comments_controller.rb

@@ -26,7 +26,7 @@ module ForemanDatacenter
       @comment = Comment.find(params[:id])
       @device = find_commentable(@comment)
       @submodule = parse_submodule(@comment)
-      if @comment.user == @current_user
+      if @comment.user == @current_user or @comment.user.nil?
         if @comment.update(comment_params)
           process_success :success_redirect => "/datacenter/#{@submodule}/#{@comment.commentable_id}#comment-#{@comment.id}"
         else
@@ -39,7 +39,7 @@ module ForemanDatacenter
 
     def destroy
       @comment = Comment.find(params[:id])
-      if @comment.user == @current_user
+      if @comment.user == @current_user or @comment.user.nil?
         if @comment.destroy
           process_success :success_redirect => "/datacenter/#{@resource}/#{@id}#comment-#{@comment.id}"
         else
@@ -60,7 +60,7 @@ module ForemanDatacenter
       comment = Comment.find(params[:id])
       commentable = comment.commentable_type.constantize.find(comment.commentable_id)
       resource = parse_submodule(comment)
-      if comment.user != @current_user
+      unless comment.user == @current_user or comment.user.nil?
         process_error :redirect => (request.referrer || "/datacenter/#{resource}/#{commentable.id}" || root_path), :error_msg => _("You can edit only your own comments")
         return
       end
@@ -97,3 +97,4 @@ module ForemanDatacenter
   end
 end
 
+

data/app/views/foreman_datacenter/comments/_children.html.erb

@@ -1,4 +1,4 @@
-<ul class="none-list">
+<ul class="none-list-child">
   <li>
     <% c.each do |comment, children |%>
       <%= render 'foreman_datacenter/comments/item', comment: comment, commentable_data: commentable_data %>

data/app/views/foreman_datacenter/comments/_item.html.erb

@@ -18,7 +18,7 @@
   <small>
     <%= link_to "Reply", new_comment_path(parent_id: comment.id, resource: commentable_data[:resource], resource_id: commentable_data[:id]) %>
     &nbsp;
-    <% if @current_user == comment.user %>
+    <% if @current_user == comment.user or comment.user.nil? %>
       <%= link_to "Edit", "/datacenter/comments/#{comment.id}/edit" %>
       &nbsp;
       <%= link_to "Delete", "/datacenter/#{commentable_data[:resource]}/#{commentable_data[:id]}/comments/#{comment.id}", method: :delete, data: {confirm: "Are you sure?"} %>

data/lib/foreman_datacenter/version.rb

@@ -1,3 +1,3 @@
 module ForemanDatacenter
-  VERSION = '0.1.36'.freeze
+  VERSION = '0.1.37'.freeze
 end

data/lib/tasks/devices_tasks.rake

@@ -18,7 +18,19 @@ namespace :foreman_datacenter do
       end
     end
   end
+
+  task comments: :environment do
+    # creating new comments from old_comments column and flushing it
+    ForemanDatacenter::Device.all.each do |device|
+      if device.old_comments != ""
+        begin
+          device.comments.create!(content: device.old_comments)
+          device.update_attribute(:old_comments, "")
+        rescue => e
+          puts "#{e}"
+        end
+      end
+    end
+  end
 end
 
-# TODO
-# comments

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_datacenter
 version: !ruby/object:Gem::Version
-  version: 0.1.36
+  version: 0.1.37
 platform: ruby
 authors:
 - Pavel Ivanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-21 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface