drg_blog_news_forum 0.6.0 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e307b17051749b2428f07d7615dd33737f23f600ae71c753dccab91cd11ea180
-  data.tar.gz: f90a7aa381787ce561f8936b9ba018af524755392dc45cdaa48328d73bebb432
+  metadata.gz: d7c8446ea001f5ab43f8a72b31734c3d47a6bb91c4e20a2d7809637955c46f24
+  data.tar.gz: f0611acafe1e371e2a0f7ed22ca0fa7ab56b1fb3f0479af95ac0c4bbf66377be
 SHA512:
-  metadata.gz: 7c8626aa7bb8a48b97a3ec7a04f8d09341082cce69980ba373e29091dd431b69d0d9cc95603f6358095423a5fc77aff03c2c55a55fa7e6b9696eb526137e6355
-  data.tar.gz: dd9b14a931d2720ac83d51fb1d0bacd91eac54e852d693028e1557f3d0d24516a9a7d6fefe84f77b64daa7e05a0ee70414cccb20ebd33aed53ba01e5f3a595dc
+  metadata.gz: 88a6ad9c75a57da86b02a2d6a7d7822fbd3793e206f04896d5ade42055c943e7d66b5b3f80c9fb653c247b61bd2b0cf36e3717c226191528cb32e109b15bb3d3
+  data.tar.gz: b3f17504472c9aaf4644727a32a3dde78e5c31181bd47aaa4a62050e6d1210574f8c8c82c804845f5f88c404ca03d489e5241abe241dd25c2b044fa86048924a

data/README.md

@@ -30,7 +30,7 @@ Please see the DRG CMS website for up-to-date documentation:
 License
 -------
 
-Copyright (c) 2014-2018 Damjan Rems
+Copyright (c) 2014-2022 Damjan Rems
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/{controllers/drgcms_controls → controls}/dc_blog_dc_reply_control.rb

@@ -25,7 +25,7 @@
 ######################################################################
 # DrgcmsControls for DcBlog.DcReply form
 ######################################################################
-module DrgcmsControls::DcBlogDcReplyControl
+module DcBlogDcReplyControl
 
 ######################################################################
 # Called when new empty record is created

data/app/{controllers/drgcms_controls → controls}/dc_forum_topic_control.rb

@@ -25,7 +25,7 @@
 ######################################################################
 # DrgcmsControls for DcForumTopic form
 ######################################################################
-module DrgcmsControls::DcForumTopicControl
+module DcForumTopicControl
 ######################################################################
 # Called when new empty record is created
 ######################################################################

data/app/{controllers/drgcms_controls → controls}/dc_forum_topic_dc_reply_control.rb

@@ -25,7 +25,7 @@
 ######################################################################
 # DrgcmsControls for DcForum.DcReply form
 ######################################################################
-module DrgcmsControls::DcForumTopicDcReplyControl
+module DcForumTopicDcReplyControl
 
 ######################################################################
 # Called when new empty record is created

data/app/{controllers/drgcms_controls → controls}/dc_news_dc_reply_control.rb

@@ -25,7 +25,7 @@
 ######################################################################
 # DrgcmsControls for DcBlog.DcReply form
 ######################################################################
-module DrgcmsControls::DcNewsDcReplyControl
+module DcNewsDcReplyControl
 
 ######################################################################
 # Called when new empty record is created

data/app/{controllers/drgcms_controls → controls}/reply_control.rb

@@ -25,7 +25,7 @@
 ######################################################################
 # DrgcmsControls for DcBlog.DcReply form
 ######################################################################
-module DrgcmsControls::ReplyControl
+module ReplyControl
 
 ######################################################################
 # Called when new empty record is created

data/app/forms/cms_menu.yml

@@ -23,26 +23,26 @@
 menu:
   80_dc_forum_menu:
     caption: dc_forum.menu_caption
-    icon: cubes lg
+    icon: forum
     items:
       10: 
         caption: helpers.label.dc_blog.tabletitle
         controller: cmsedit
-        icon: comment-o lg
+        icon: comment-o
         table: dc_blog
       20: 
         caption: helpers.label.dc_news.tabletitle
         controller: cmsedit
-        icon: info lg
+        icon: info-o
         table: dc_news
       30: 
         caption: helpers.label.dc_forum.tabletitle
         controller: cmsedit
-        icon: server lg
+        icon: forum-o
         table: dc_forum
       40: 
         caption: helpers.label.dc_reply.tabletitle
         controller: cmsedit
-        icon: commenting-o lg
+        icon: comment-o
         table: dc_reply
                        

data/app/helpers/application_helper.rb

@@ -1,2 +1,2 @@
 module ApplicationHelper
-end
+end

data/app/helpers/dc_bnf_helper.rb

@@ -22,7 +22,7 @@
 #++
 
 module DcBnfHelper
-#include DcApplicationHelper  
+include CmsCommonHelper
 
 ########################################################################
 # 

data/app/models/dc_blog.rb

@@ -46,8 +46,9 @@ included do
 
   field :subject,     type: String,  default: ''
   field :body,        type: String,  default: ''
-  field :active,      type: Boolean, default: true
+  field :active,      type: Mongoid::Boolean, default: true
   field :link,        type: String
+  field :replies,     type: Integer, default: 0  
 
   field :created_by,  type: BSON::ObjectId
   field :created_by_name, type: String
@@ -71,9 +72,9 @@ def do_before_save
   if self.link.size < 5
     self.link = UnicodeUtils.downcase(DcPage.clear_link(self.subject)) + Time.now.strftime('-%Y-%m-%d')
   end
-  if self.created_by_name.nil?
-    self.created_by_name = DcUser.find(self.created_by).name
-  end
+  #if self.created_by_name.nil?
+    self.created_by_name = DcUser.find(self.created_by).name.downcase.gsub(' ','-')
+  #end
 end
   
 ########################################################################

data/app/models/dc_news.rb

@@ -48,6 +48,7 @@ class DcNews
   field :body,        type: String,  default: ''
   field :active,      type: Boolean, default: true
   field :link,        type: String
+  field :replies,     type: Integer, default: 0  
   
   field :valid_from,  type: Date
   field :valid_to,    type: Date

data/app/renderers/dc_blog_renderer.rb

@@ -26,6 +26,7 @@
 ########################################################################
 class DcBlogRenderer < DcRenderer
 include DcApplicationHelper
+include CmsCommonHelper
 
 ########################################################################
 # Show one blog entry
@@ -49,10 +50,17 @@ end
 ########################################################################
 def list(path)
   # get blogger id from document path
-  blogger_id = path.last.split('-').last  
-  documents  = DcBlog.only(:created_by, :link, :subject, :created_at)
-               .where(created_by: blogger_id, active: true).order_by(created_at: -1)
-               .page(@parent.params[:page]).per(10)
+  blogger_id = path.last.split('-').last
+  documents  = if BSON::ObjectId.legal?(blogger_id)
+    DcBlog.only(:created_by, :link, :subject, :created_at)
+          .where(created_by: blogger_id, active: true).order_by(created_at: -1)
+          .page(@parent.params[:page]).per(10)
+  else
+    blogger_name = path.last
+    DcBlog.only(:created_by, :link, :subject, :created_at)
+          .where(created_by_name: blogger_name, active: true).order_by(created_at: -1)
+          .page(@parent.params[:page]).per(10)
+  end
   
   @parent.render partial: 'dc_blog/list', formats: [:html], locals: { documents: documents } 
 end

data/app/renderers/dc_forum_renderer.rb

@@ -26,7 +26,7 @@
 ########################################################################
 class DcForumRenderer < DcRenderer
 include DcApplicationHelper
-
+include CmsCommonHelper
   
 ########################################################################
 # 

data/app/renderers/dc_news_renderer.rb

@@ -26,6 +26,7 @@
 ########################################################################
 class DcNewsRenderer < DcRenderer
 include DcApplicationHelper
+include CmsCommonHelper
 
 ########################################################################
 # Collects documents for list

data/app/views/dc_blog/_bloggers.html.erb

@@ -9,6 +9,6 @@
 
 <% for blogger in bloggers %>
   <div class="blog-entry">
-     <%= link_to( blogger.name, { path: "blog/#{blogger.name.downcase.gsub(' ','-')}-#{blogger.id}" } )%>
+     <%= link_to( blogger.name, { path: "blog/#{blogger.name.downcase.gsub(' ','-')}" } )%>
   </div>
 <% end %>

data/app/views/dc_blog/_list.html.erb

@@ -6,7 +6,7 @@
   <div class="entry">
     <div class="date"><%= dc_pretty_date(document.created_at) %></div>
     <div class="title">
-      <%= link_to( path: "#{(@options[:path] << document.link).join('/')}" ) do %>
+      <%= link_to( path: "#{(@options[:path] + [document.link]).join('/')}" ) do %>
         <h2><%= document.subject %> </h2>
       <% end %>
     </div>

data/app/views/dc_forum/_forums.html.erb

@@ -1,5 +1,6 @@
 
-<%= pp opts; "<div id=\"#{opts[:div_id]}\">".html_safe if opts[:div_id] %>
+<%= "<div id=\"#{opts[:div_id]}\">".html_safe if opts[:div_id] %>
+
 <%= if session[:edit_mode] > 1 
   dc_link_for_create(controller: 'cmsedit', table: 'dc_forum', title: 'dc_forum.add_new_forum' )
     end %>
@@ -40,4 +41,5 @@
     </div>
   <% end %>
 </div>
+
 <%= "</div>".html_safe if opts[:div_id] %>

data/app/views/dc_forum/_topic.html.erb

@@ -28,7 +28,7 @@
   <h2><%= forum.name %></h2>
 
   <div class="topic-top"><h3><%= topic.subject %></h3>
-    <%= t('dc_forum.created_by') %>: <%= topic.created_by_name %> <%= dc_pretty_date(topic.created_at) %>
+    <%= t('dc_forum.created_by') %>: <%= dc_pretty_date(topic.created_at) %>, <%= topic.created_by_name %> 
   </div>
   <div class="topic-body"><%= topic.body.html_safe %></div>
   

data/app/views/dc_forum/_topics.html.erb

@@ -22,15 +22,15 @@
     <%= link_to(topic.subject, { path: params[:path], forum: params[:forum], topic: topic._id } ) %><br>
       
       <b><%= t('dc_forum.created_by') %>:</b> <%= topic.created_by_name %> 
-      <%= dc_pretty_date(topic.created_at) %> &nbsp;|&nbsp;
+      &nbsp;|&nbsp; <%= dc_pretty_date(topic.created_at) %> &nbsp;|&nbsp;
 
       <b><%= t('dc_forum.replies') %>:</b>
       <%= topic.replies %>
       
       <% if topic.updated_at != topic.created_at %>
-         &nbsp;|&nbsp; <b><%= t('dc_forum.last') %>:</b>
+        &nbsp;|&nbsp; <b><%= t('dc_forum.last') %>:</b>
         <%= topic.updated_by_name %>
-        <%= dc_pretty_date(topic.updated_at) %>
+        &nbsp;|&nbsp; <%= dc_pretty_date(topic.updated_at) %>
       <% end %>
     </div>
   <% end %>

data/app/views/dc_replay/_reply.html.erb

@@ -9,8 +9,7 @@
                    target: 'iframe_edit', ref: 'nofollow') %>
     </span>
     <b><%= reply.subject %></b><br>
-    <%= t('dc_forum.replied_by') %>: <%= reply.created_by_name %>, 
-    <%= dc_pretty_date(reply.created_at) %>&nbsp;&nbsp;<br>
+    <%= t('dc_forum.replied_by') %>: <%= dc_pretty_date(reply.created_at) %>, <%= reply.created_by_name %> <br>
   </div>
   <div class="reply-body <%= oddeven %>"><%= reply.body.html_safe %></div>
 <% end %>

data/config/locales/models_sl.yml

@@ -52,6 +52,7 @@ sl:
         body: Vsebina
         created_at: Ustvarjeno
         dc_user_id: Ustvaril
+        created_by_name: Ustvaril
         dc_forum_id: Forum
         active: Aktiven  
         replies: Odgovorov

data/lib/drg_blog_news_forum/version.rb

@@ -1,3 +1,3 @@
 module DrgBlogNewsForum
-  VERSION = "0.6.0"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_blog_news_forum
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.4
 platform: ruby
 authors:
 - Damjan Rems
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-27 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,11 +50,11 @@ files:
 - README.md
 - Rakefile
 - app/assets/stylesheets/drg_blog_news_forum.css
-- app/controllers/drgcms_controls/dc_blog_dc_reply_control.rb
-- app/controllers/drgcms_controls/dc_forum_topic_control.rb
-- app/controllers/drgcms_controls/dc_forum_topic_dc_reply_control.rb
-- app/controllers/drgcms_controls/dc_news_dc_reply_control.rb
-- app/controllers/drgcms_controls/reply_control.rb
+- app/controls/dc_blog_dc_reply_control.rb
+- app/controls/dc_forum_topic_control.rb
+- app/controls/dc_forum_topic_dc_reply_control.rb
+- app/controls/dc_news_dc_reply_control.rb
+- app/controls/reply_control.rb
 - app/forms/cms_menu.yml
 - app/forms/dc_blog.yml
 - app/forms/dc_forum.yml
@@ -103,7 +103,7 @@ homepage: http://www.drgcms.org
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,11 +118,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: 'DRG CMS: Blog, news and forum plugin for DRG CMS'
 test_files:
-- test/test_helper.rb
-- test/integration/navigation_test.rb
 - test/drg_blog_news_forum_test.rb
+- test/integration/navigation_test.rb
+- test/test_helper.rb