tkh_content 0.9.16 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc7e2632e838c737c884c85407b4ecb138a45bb8
-  data.tar.gz: 6e6fde83fa313aa364ece8625235ed2662cb0741
+  metadata.gz: 196660d06e8ea8145cd14796667136f660533cbe
+  data.tar.gz: 99db882adc8d6a6b09d6e3f3c38443a31e693061
 SHA512:
-  metadata.gz: 8ea78f5026638811c223906318f257b27728768c0afea888cacfda3bcfead1fadf4c71c065fd61c723608686ba194d60046a728197c730aa57d37a11d5cc942c
-  data.tar.gz: 5c4782a9dc46a68ee159ac6283622bb03036c6cc8b23f2d4a39032b9a21034c5f2a9a72349ef6b654c0e771f809940a67c6c2fbd467c0662c4c0d059bfad0132
+  metadata.gz: e32b81edf3904a604996aa39ae9d54feac74e607fe87be3bbeefb8f2092af353633298ec8cfbca280016899510c78f77ed09aef6eacd32e0f1a588ed5128238b
+  data.tar.gz: c93e7e46ffde7f0f00c72182a958a657b00510db11a30df77059c95e8df87a23f935eb37e993ce1aeccf0117b3b727a8414b996218f5307d3e6d0fb11987966d

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 
 
+## 0.9.17
+
+* Log comment creation to activity feed.
+* Little reformating of individual comment partial called from admin panel.
+* Nil proofed the calling of a comment commentable name or title.
+* Debugged comment feed. Was referencing the comment page instead of the polymorphic commentable association.
+
+
 ## 0.9.16
 
 * Comments are now polymorphic. rake 'tkh_content:update' and 'rake db:migrate' commands needed.

data/app/controllers/comments_controller.rb

@@ -22,6 +22,7 @@ class CommentsController < ApplicationController
     @comment.locale = I18n.locale.to_s
     @comment.status = 'pending' # translation not done with globalize3 but with locale files upon showing status to user
     if @comment.save
+      Activity.create doer_id: current_user.id, message: "left a comment attached to: #{view_context.link_to (@comment.commentable.try(:name) || @comment.commentable.try(:title) || 'unknown'), @comment.commentable}."
       redirect_to @comment.commentable, notice: t('comments.create.notice')
     else
       flash[:warning] = t('comments.create.warning')

data/app/views/comments/_admin_individual_comment.html.erb

@@ -2,7 +2,9 @@
   <td class='text-center'>
     <% model_name = comment.commentable.class.name.underscore %>
     <% p = model_name.to_s + '_path' %>
-    <%= comment.author.name %> - <%= link_to (comment.commentable.try(:title) || comment.commentable.try(:name)), comment.commentable %> (<%= comment.locale %>). <%= link_to l(comment.created_at, format: :tkh_default), p(comment.commentable, anchor: "comment-#{comment.id}") %>
+    by <%= link_to comment.author.name, detail_path(comment.author) %><br />
+    on <%= link_to (comment.commentable.try(:title) || comment.commentable.try(:name)), comment.commentable %> (<%= comment.locale %>).<br />
+    <%= link_to l(comment.created_at, format: :tkh_default), p(comment.commentable, anchor: "comment-#{comment.id}") %>
     <br /><br />
     <p class="admin-comment-body"><%= sanitize comment.body.gsub(/\r\n?/, "<br>"), :tags => %w(br), :attributes => %w() %></p>
     <strong><%= t("comments.status.#{comment.status}") %></strong><br />

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

@@ -1,16 +1,12 @@
 <%= simple_form_for @comment, :html => { class: 'form-horizontal' } do |f| %>
 	<%= f.error_notification %>
 
-  <div class="form-inputs">
 		<%= @comment.author.name %><br />
-		<%= link_to (@comment.commentable.title || @comment.commentable.name), @comment.commentable %><br />
+		<%= link_to (@comment.commentable.try(:title) || @comment.commentable.try(:name)), @comment.commentable %><br />
 		<%#= f.input :short_title, hint: 'ideally one word only, used for the menu' %><br />
 		<%= render 'comments/status_buttons', comment: @comment %><br />
-	  <%= f.input :body, :input_html => { :rows => 3 } %>
-	</div>
-
-  <div class="form-actions">
+	  <%= f.input :body, :input_html => { rows: 3, cols: 55 } %>
+    <br />
     <%= f.button :submit, :class => 'btn btn-primary' %>
-  </div>
 
 <% end %>

data/app/views/comments/for_feed.atom.builder

@@ -2,15 +2,15 @@ atom_feed(:language => I18n.locale.to_s) do |feed|
   feed.title "#{Setting.first.site_name}. #{t('activerecord.models.comments').capitalize}"
   feed.updated @comments.maximum(:updated_at)
   feed.language I18n.locale.to_s
-  
+
   @comments.each do |comment|
-    feed.entry comment, url: page_url(comment.page, anchor: "comment-#{comment.id}") do |entry|
+    feed.entry comment, url: page_url(comment.commentable, anchor: "comment-#{comment.id}") do |entry|
       entry.title truncate comment.body, length: 30, separator: ' ...'
-      entry.url page_url(comment.page, anchor: "comment-#{comment.id}")
+      entry.url page_url(comment.commentable, anchor: "comment-#{comment.id}")
       entry.content comment.body
       entry.author do |author|
         author.name comment.author.name
       end
     end
   end
-end
+end

data/lib/tkh_content.rb

@@ -6,6 +6,7 @@ require 'stringex'
 require 'globalize'
 require 'will_paginate'
 require 'ckeditor_rails'
+require 'tkh_activity_feeds'
 
 module TkhContent
   class Engine < ::Rails::Engine

data/lib/tkh_content/version.rb

@@ -1,3 +1,3 @@
 module TkhContent
-  VERSION = "0.9.16"
+  VERSION = "0.9.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.17
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.2
+- !ruby/object:Gem::Dependency
+  name: tkh_activity_feeds
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement