foreman_datacenter 0.1.27 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fbb2b60766fe6af7321a5449bf8e57b52a47cf9
-  data.tar.gz: 316f815ce5eca799bd92918e66077c919dc0fa73
+  metadata.gz: c3bb886dd6e594c44644dc906e0a114d3753fd41
+  data.tar.gz: 37c34a36aba8e89822ac4b470ad169dad4ad948c
 SHA512:
-  metadata.gz: 0146588b60a9fae132d84d41c5e93251f2f3cae0693fc271623f91cbf28266d669f0fb50d267897cc9249730abffef485731ddb5834711de046afd902cba08c0
-  data.tar.gz: 6dc8a7674869873604c795ba6f2de7758a2da3dd42fc2c941ccb2db3999aab07778f7e6f55dfb92fbe04584ddc630bdc6b728e0015a6becf51b352ba951e0bc8
+  metadata.gz: 1ce51989419d2d0118522ba9d1692d63a1abb560493e5b53d1445dc81c8cc852f78a411e39d7ff2888678945419d929380bcd9edbeeb63acbae52526c7542fe6
+  data.tar.gz: 7535811c728a339ef7f220d786e42f3a257e8af504986c6137ad91331230e0ddb8d1f062e5a0506f4728e4a4934f9affdb5007d59bfe38a261f6b7bbfc4a4498

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

@@ -0,0 +1,4 @@
+ul.none-list {
+  list-style-type: none !important;
+}
+

data/app/controllers/foreman_datacenter/comments_controller.rb

@@ -2,8 +2,14 @@ module ForemanDatacenter
   class CommentsController < ApplicationController
     before_filter :load_resource, :load_commentable
 
+    def new
+      @comment = Comment.new
+      @parent = Comment.find(params[:parent_id])
+    end
+
     def edit
       @comment = Comment.find(params[:id])
+      @parent = @comment.parent
     end
 
     def create
@@ -38,15 +44,23 @@ module ForemanDatacenter
     private
 
     def load_resource
-      @resource, @id = request.path.split('/')[2, 3]
+      if (params[:resource] && params[:resource_id])
+        @resource, @id = params[:resource], params[:resource_id]
+      else
+        @resource, @id = request.path.split('/')[2, 3]
+      end
     end
 
     def load_commentable
-      @commentable = "foreman_datacenter::#{@resource.capitalize}".singularize.classify.constantize.find(@id.to_i)
+      begin
+        @commentable = "foreman_datacenter::#{@resource.capitalize}".singularize.classify.constantize.find(@id.to_i)
+      rescue
+        @commentable = "foreman_datacenter::#{params[:resource].capitalize}".singularize.classify.constantize.find(params[:resource_id].to_i)
+      end
     end
 
     def comment_params
-      params[:foreman_datacenter_comment].permit(:content, :commntable_type, :commentable_id)
+      params[:foreman_datacenter_comment].permit(:content, :commntable_type, :commentable_id, :parent_id)
     end
 
     def find_commentable(comment)

data/app/controllers/foreman_datacenter/devices_controller.rb

@@ -116,7 +116,8 @@ module ForemanDatacenter
     end
 
     def load_resource
-      @resource, @id = request.path.split('/')[2, 3]
+      resource, id = request.path.split('/')[2, 3]
+      @commentable_data = {resource: resource, id: id }
     end
 
     def populate_from_host
@@ -142,3 +143,4 @@ module ForemanDatacenter
     end
   end
 end
+

data/app/models/foreman_datacenter/comment.rb

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

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

@@ -0,0 +1,9 @@
+<ul class="none-list">
+  <li>
+    <% c.each do |comment, children |%>
+      <%= render 'foreman_datacenter/comments/item', comment: comment, commentable_data: commentable_data %>
+      <%= render 'foreman_datacenter/comments/children', commentable_data: commentable_data, c: children if children.present? %>
+    <% end %>
+  </li>
+</ul>
+

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

@@ -0,0 +1,23 @@
+<% stylesheet 'foreman_datacenter/comments' %>
+
+<table class="table table-hover panel-body table-striped">
+  <tbody>
+    <% comments.roots.each do |c| %>
+                        <tr>
+                                <td>
+                                        <ul class="none-list">
+                                                <li>
+              <%= render 'foreman_datacenter/comments/item', comment: c, commentable_data: commentable_data %>
+                                                </li>
+            <% if c.root.descendants != [] %>
+              <%= render 'foreman_datacenter/comments/children', c: c.root.descendants.arrange, commentable_data: commentable_data %>
+            <% end %>
+                                        </ul>
+                                </td>
+                        </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= render 'foreman_datacenter/comments/form'%>
+

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

@@ -2,12 +2,44 @@
   <%= form_for @comment, url: "/datacenter/comments/#{@comment.id}" do |f| %>
     <div class="clearfix">
       <div class="form-group">
+        <% if @parent %>
+          <%= f.label "Parent comment" %>
+          <p>
+            <%= @parent.content %>
+          </p>
+        <% end %>
         <div class="col-md-5">
-          <%= f.text_area :content, rows: 8, class: "form-control" %>
+          <%= f.text_area :content, rows: 6, class: "form-control" %>
+        </div>
+      </div>
+    </div>
+    <div class="btn-toolbar">
+      <%= link_to 'Back', url_for(:back), class: 'btn btn-success' %>
+      <%= f.submit "Edit", class: "btn btn-primary remove_form_templates" %>
+    </div>
+  <% end %>
+<% elsif action_name == "new" %>
+  <%= form_for @comment, url: "/datacenter/comments", method: :post do |f| %>
+    <div class="clearfix">
+      <div class="form-group">
+        <% if @parent %>
+          <%= f.label "Parent comment" %>
+          <p>
+            <%= @parent.content %>
+          </p>
+        <% end %>
+        <div class="col-md-5">
+          <%= f.text_area :content, rows: 6, class: "form-control" %>
+          <%= f.hidden_field :parent_id, value: @parent.id %>
+          <%= hidden_field_tag "resource", params[:resource] %>
+          <%= hidden_field_tag "resource_id", params[:resource_id] %>
         </div>
       </div>
     </div>
-    <%= f.submit "Edit comment", class: "btn btn-primary remove_form_templates" %>
+    <div class="btn-toolbar">
+      <%= link_to 'Back', url_for(:back), class: 'btn btn-success' %>
+      <%= f.submit "Reply", class: "btn btn-primary remove_form_templates" %>
+    </div>
   <% end %>
 <% else %>
   <%= form_for [@commentable, @comment], url: "/datacenter/devices/#{@commentable.id}/comments" do |f| %>
@@ -18,7 +50,7 @@
         </div>
       </div>
     </div>
-    <%= f.submit "Add comment", class: "btn btn-primary remove_form_templates" %>
+    <%= f.submit "Post", class: "btn btn-primary remove_form_templates" %>
   <% end %>
 <% end %>
 

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

@@ -0,0 +1,24 @@
+<strong>
+        <small class="text-left pull-left">
+                Posted by ... <%#= "#{@user.firstname} #{@user.lastname}" %> at <%= comment.updated_at %>
+        </small>
+
+        <small class="text-right pull-right">
+                <%= link_to "##{comment.id}", "#comment-#{comment.id}" %>
+        </small>
+</strong>
+<br/>
+<div class="text-left pull-left">
+        <%= comment.content %>
+  <br/>
+  <small>
+    <%= link_to "Reply", new_comment_path(parent_id: comment.id, resource: commentable_data[:resource], resource_id: commentable_data[:id]) %>
+    &nbsp;
+    <%= 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?"} %>
+  </small>
+</div>
+<br/>
+<br/>
+

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

@@ -0,0 +1,4 @@
+<% title 'Reply to comment' %>
+
+<%= render 'form' %>
+

data/app/views/foreman_datacenter/devices/index.html.erb

@@ -1,4 +1,5 @@
 <% javascript 'foreman_datacenter/devices' %>
+<% stylesheet 'foreman_datacenter/comments' %>
 
 <% title _('Devices') %>
 <% title_actions display_link_if_authorized(_('New device'), hash_for_new_device_path, class: 'btn btn-success'),

data/config/routes.rb

@@ -4,8 +4,10 @@ Foreman::Application.routes.draw do
   get 'datacenter/import_to_device', to: 'hosts#import_to_device',
       as: 'import_to_device'
 
+
   scope 'datacenter', module: :foreman_datacenter do
-    resources :comments, only: [:edit, :update]
+    resources :comments, only: [:new, :edit, :create, :update]
+
     resources :sites
     resources :racks do
       get :rack_groups, on: :collection
@@ -103,3 +105,4 @@ Foreman::Application.routes.draw do
     end
   end
 end
+

data/lib/foreman_datacenter/version.rb

@@ -1,3 +1,3 @@
 module ForemanDatacenter
-  VERSION = '0.1.27'.freeze
+  VERSION = '0.1.28'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_datacenter
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors:
 - Pavel Ivanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-01 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -111,6 +111,7 @@ files:
 - app/assets/javascripts/foreman_datacenter/management_devices.js
 - app/assets/javascripts/foreman_datacenter/racks.js
 - app/assets/javascripts/foreman_datacenter/shared.js
+- app/assets/stylesheets/foreman_datacenter/comments.css
 - app/assets/stylesheets/foreman_datacenter/device_interface_connections.css
 - app/controllers/concerns/foreman_datacenter/hosts_controller_extensions.rb
 - app/controllers/foreman_datacenter/comments_controller.rb
@@ -176,8 +177,12 @@ files:
 - app/models/foreman_datacenter/rack.rb
 - app/models/foreman_datacenter/rack_group.rb
 - app/models/foreman_datacenter/site.rb
+- app/views/foreman_datacenter/comments/_children.html.erb
+- app/views/foreman_datacenter/comments/_comments.html.erb
 - app/views/foreman_datacenter/comments/_form.html.erb
+- app/views/foreman_datacenter/comments/_item.html.erb
 - app/views/foreman_datacenter/comments/edit.html.erb
+- app/views/foreman_datacenter/comments/new.html.erb
 - app/views/foreman_datacenter/console_port_templates/_form.html.erb
 - app/views/foreman_datacenter/console_port_templates/new.html.erb
 - app/views/foreman_datacenter/console_ports/_for_device.html.erb