foreman_datacenter 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a51927a6d6c5ab0213cf5133fbf9e5128ab0d9f6
-  data.tar.gz: 3f176391dd82707b426739969ac176b61fd5b61a
+  metadata.gz: 49cdb573f462e46ab86a64cd7b8915f0c09ff72e
+  data.tar.gz: 8944573b46fa5dfa2932be16d7c8586ae9907687
 SHA512:
-  metadata.gz: 47fa4ed6fcd7cdefa808b58db7af49ebb20c8cd0743a794afbbcf7463d2417b92db3b81f4419b32d4721f941fc7ff1e5157d246f233420562d12b3976dc62ade
-  data.tar.gz: 27c6ba3746379282ef251e985a72df79d1a010471c0a195872378209763aba4977fafddd509a9d44b72cf8d5c6d6738b421b1703b781dba99aeccf38d0630da9
+  metadata.gz: c69e5748012abb678d68b200eca283cfd60825992cca16e7632cad172d20d228a5970e71787630752b4991b8d5480961e55410c05beabea829df7ec30c84b96a
+  data.tar.gz: a8193287b95f9c995546bb339c5e0f2f23f8dd7397c5f1ae170319ad5f1ab88e7a35580c25b3b81705275806a01f42eb96274cf262d702fe07b8deb95535a690

data/app/controllers/foreman_datacenter/comments_controller.rb

@@ -13,7 +13,7 @@ module ForemanDatacenter
     end
 
     def create
-      @comment = @commentable.comments.new(comment_params)
+      @comment = @commentable.comments.new(comment_params.merge(user_id: User.current.id))
       if @comment.save
         process_success :success_redirect => "/datacenter/#{@resource}/#{@id}#comment-#{@comment.id}"
       else
@@ -25,7 +25,7 @@ module ForemanDatacenter
       @comment = Comment.find(params[:id])
       @device = find_commentable(@comment)
       @submodule = parse_submodule(@comment)
-      if @comment.update(comment_params)
+      if @comment.update(comment_params.merge(user_id: User.current.id))
         process_success :success_redirect => "/datacenter/#{@submodule}/#{@comment.commentable_id}#comment-#{@comment.id}"
       else
         process_error :redirect => "/datacenter/#{@submodule}/#{@comment.commentable_id}#comment-#{@comment.id}", :error_msg => _("Failed: %s") % (e)
@@ -60,7 +60,7 @@ module ForemanDatacenter
     end
 
     def comment_params
-      params[:foreman_datacenter_comment].permit(:content, :commntable_type, :commentable_id, :parent_id)
+      params[:foreman_datacenter_comment].permit(:content, :commntable_type, :commentable_id, :parent_id, :user_id)
     end
 
     def find_commentable(comment)

data/app/models/foreman_datacenter/comment.rb

@@ -2,6 +2,7 @@ module ForemanDatacenter
   class Comment < ActiveRecord::Base
     self.table_name = "datacenter_comments"
     belongs_to :commentable, polymorphic: true  
+    belongs_to :user
     has_ancestry
     # belongs_to :parent, class_name: "ForemanDatacenter::Comment"
     # has_many :children, class_name: "ForemanDatacenter::Comment", foreign_key: "parent_id"

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

@@ -1,6 +1,10 @@
 <strong id="comment-<%= comment.id %>">
   <small class="text-left pull-left">
-    Posted by ... <%#= "#{@user.firstname} #{@user.lastname}" %> at <%= comment.updated_at %>
+    <% if comment.user %>
+      Posted by <%= "#{comment.try(:user).try(:firstname)} #{comment.try(:user).try(:lastname)}" %> at <%= comment.updated_at %>
+  <% else %>
+      Posted at <%= comment.updated_at %>
+  <% end %>
 </small>
 
 <small class="text-right pull-right">

data/lib/foreman_datacenter/version.rb

@@ -1,3 +1,3 @@
 module ForemanDatacenter
-  VERSION = '0.1.29'.freeze
+  VERSION = '0.1.30'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_datacenter
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
 platform: ruby
 authors:
 - Pavel Ivanov