drg_blog_news_forum 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7c8446ea001f5ab43f8a72b31734c3d47a6bb91c4e20a2d7809637955c46f24
-  data.tar.gz: f0611acafe1e371e2a0f7ed22ca0fa7ab56b1fb3f0479af95ac0c4bbf66377be
+  metadata.gz: 1bb4d4fe66a1589ffa1def1409ac35c00fa23ea3c63a8b7e6c19cc2baa7d4606
+  data.tar.gz: 960fbc3f0585a5feff31e036e565ddc073a64879442c7140a2625c722195cf76
 SHA512:
-  metadata.gz: 88a6ad9c75a57da86b02a2d6a7d7822fbd3793e206f04896d5ade42055c943e7d66b5b3f80c9fb653c247b61bd2b0cf36e3717c226191528cb32e109b15bb3d3
-  data.tar.gz: b3f17504472c9aaf4644727a32a3dde78e5c31181bd47aaa4a62050e6d1210574f8c8c82c804845f5f88c404ca03d489e5241abe241dd25c2b044fa86048924a
+  metadata.gz: c977e88431e029e9de935d144b66a8f1eb3e599a2bffce1d272eff3a81efa2fa5a0d4069c4d3a7b79d0e55d41acce12de10164a483c28f8db05362c4cb488d47
+  data.tar.gz: 5211945f61917ddf68d5ff52a30de8f58ef5acdd0610b9e6de85bcc71d35d2a015d080247222ba275e1e0d573baec36595724289a4959d4cfb3406c78a1f47d7

data/app/assets/stylesheets/drg_blog_news_forum.css

@@ -206,3 +206,12 @@ padding-bottom: 5px;
 .news h2 {
   font-size: 1.4em;
 }
+
+.news .paginate {
+  text-align: center;
+  padding: 1rem 0;
+}
+
+.news .pagination {
+  float: none;
+}

data/app/forms/news_settings.yml

@@ -18,20 +18,29 @@ form:
       help: dc_news.categories_help
       html:
         include_blank: true        
-      
+
     20:
       name: number
       type: text_field
       size: 3
       text: dc_news.number
       help: dc_news.number_help
-      
+
     30:
       name: paging
       type: check_box
       text: dc_news.paging
       help: dc_news.paging_help
+      group: 2
       
+    35:
+      name: per_page
+      type: text_field
+      size: 3
+      text: dc_news.per_page
+      help: dc_news.per_page_help
+      line: bottom
+
     40:
       name: small
       type: text_field

data/app/models/dc_blog.rb

@@ -69,12 +69,8 @@ included do
 # Update link if if field is left blank.
 ########################################################################
 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.downcase.gsub(' ','-')
-  #end
+  self.link = DcPage.clear_link(subject.clone).downcase + created_at.strftime('-%Y-%m-%d')
+  self.created_by_name = DcUser.find(created_by).name.downcase.gsub(' ','-')
 end
   
 ########################################################################
@@ -83,7 +79,7 @@ end
 def blogers
   blogers_role = DcRole.only(:id).find_by(sytem_name: 'bloger')
   return [] unless blogers_role
-#
+
   DcUser.where('dc_user_roles.dc_policy_role_id' => blogers_role.id).order_by(name: 1)
 end
   

data/app/renderers/dc_news_renderer.rb

@@ -40,14 +40,14 @@ def collect_documents()
     DcNews.where(active: true)
   end
   query = query.only(:id, :created_at, :subject, :created_by_name, :link)
-# paging 
+  # paging
   if @opts.dig(:settings, @opts[:element], 'paging') == '1'
-    per_page = @opts.dig(:settings, @opts[:element], 'docs_per_page') || 15
+    per_page = @opts.dig(:settings, @opts[:element], 'per_page') || 15
     query.order_by(created_at: -1).page(@parent.params[:page]).per(per_page)
   else
     query = query.and({"$or" => [{valid_from: nil}, {:valid_from.gt => Time.now.beginning_of_day}]})
 
-    limit = @opts.dig(:settings, @opts[:element], 'docs_per_view') || 5
+    limit = @opts.dig(:settings, @opts[:element], 'number') || 5
     query.order_by(created_at: -1).limit(limit)
   end
 end
@@ -70,7 +70,7 @@ end
 ########################################################################
 def list
   partial   = @opts.dig(:settings, @opts[:element], 'view') || 'dc_news/list'
-  documents = collect_documents.to_a
+  documents = collect_documents
   @parent.render(partial: partial, formats: [:html], locals: { documents: documents, opts: @opts } )
 end
 

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

@@ -15,7 +15,7 @@ title  = opts.dig(:settings, opts[:element], 'title') || t('dc_news.news')
     dc_link_for_create(controller: 'cmsedit', table: 'dc_news', title: 'dc_blog.new_entry' )
   end %>
   
-  <% for document in documents %>
+  <% documents.each do |document| %>
     <div class="document">
       <%= dc_pretty_date(document.created_at) %>
       <%= link_to( { path: "#{link}/#{document.link}" } ) do %>
@@ -23,4 +23,5 @@ title  = opts.dig(:settings, opts[:element], 'title') || t('dc_news.news')
       <% end %>
     </div>
   <% end %>
+  <% if paging %><div class="paginate"><%= paginate documents %></div><% end %>
 </div>

data/config/locales/dc_bnf_en.yml

@@ -61,6 +61,8 @@ en:
     categories_help: Define categories shown by news agregator
     number: Articles number
     number_help: Number of articles shown by news agregator
+    per_page: Articels per page
+    per_page_help: Number of articles per page
     paging: Add paging
     paging_help: Add paging links for the agregator
     small: Small

data/lib/drg_blog_news_forum/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_blog_news_forum
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Damjan Rems
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: 'DRG CMS: Blog, news and forum plugin for DRG CMS'