drg_cms 0.7.0.8 → 0.7.1.1

data/app/renderers/dc_big_menu_renderer.rb

@@ -1,4 +1,3 @@
-#coding: utf-8
 #--
 # Copyright (c) 2013+ Damjan Rems
 #
@@ -51,9 +50,7 @@ def find_selected #:nodoc:
   while ret and ret.parent != nil
     ret = DcBigMenu.find( ret.parent )
   end
-# return first if not found (something is wrong)
-#  p ret
-  ret ||= DcBigMenu.where(dc_site_id: @site._id, parent: nil, active: true).limit(1).first
+  ret || DcBigMenu.where(dc_site_id: @site._id, parent: nil, active: true).limit(1).first
 end
 
 ########################################################################
@@ -78,7 +75,7 @@ def link_4menu(item) #:nodoc:
   html = ''
   link = item.link
   link = "/#{@site.route_name}/#{item.page_id}" #if link.blank?
-#  
+
   html << @parent.link_to(item.picture, link) unless item.picture.blank?
   html << if !item.caption.blank?
     # TODO Translation
@@ -91,23 +88,23 @@ end
 ########################################################################
 def left_menu
   html = ''
-  m = DcBigMenu.find( @parent.page.menu_id )
-# Show menu on same level if selected has no children
+  menu = DcBigMenu.find( @parent.page.menu_id )
+  # Show menu on same level if selected has no children
   if DcBigMenu.where( parent: @parent.page.menu_id ).limit(1).to_a.size == 0
-    m = DcBigMenu.find( m.parent )
+    menu = DcBigMenu.find( m.parent )
   end    
-#     
-  html << "<div class='menu-left-item-top'>#{m.caption}</div>"
-  DcBigMenu.where( parent: m._id ).sort(order: 1).each do |item|
+
+  html << "<div class='menu-left-item-top'>#{menu.caption}</div>"
+  DcBigMenu.where( parent: menu.id ).order(order: 1).each do |item|
     html << (item._id == @parent.page.menu_id ? '<div class="menu-left-item-selected">' : '<div class="menu-left-item">')
     html << link_4menu(item) 
     html << '</div>'
   end
-#  
+
   html << "<div class='menu-left-item-bottom'>"
-  if m.parent
-    p = DcBigMenu.find( m.parent )
-    html << "&#9650; #{link_4menu(p)}"
+  if menu.parent
+    parent = DcBigMenu.find( menu.parent )
+    html << "&#9650; #{link_4menu(parent)}"
   end
   html << '&nbsp;</div>' 
 end
@@ -124,14 +121,14 @@ def path
     m = DcBigMenu.find( m.parent )
     a << m
   end
-#  
+
   (a.size - 1).downto(0) do |i| 
     html << "<span id=menu-path-#{a.size - 1 - i}>"
     html << link_4menu(a[i]) 
     html << (i > 0 ? ' &raquo; ' : '') #&rsaquo;&#10132;
     html << '</span>'
   end
-# Save level to parents params object
+  # Save level to parents params object
   @parent.params[:menu_level] = a.size
   html
 end
@@ -144,20 +141,21 @@ def default
   @selected = find_selected
   level_0 = DcBigMenu.where(dc_site_id: @site._id, parent: nil, active: true).sort(order: 1).to_a
   level_0.each do |item|
-# menu can be hidden from user    
+    # menu can be hidden from user
     can_view, msg = dc_user_can_view(@parent, item)
     next unless can_view
+
     klas = item.id == @selected.id ? "menu0-selected" : "menu0-item"
     html << "<li class='#{klas}'>#{ link_4menu(item) }</li>\n"
   end
   html << "</ul></div>"
-# submenu
+  # submenu
   level_1 = DcBigMenu.where(dc_site_id: @site._id, parent: @selected.id, active: true).sort(order: 1).to_a
   html << "<div class='menu1-div'><ul>\n"
   level_1.each do |item1|
-# menu can be hidden from user    
     can_view, msg = dc_user_can_view(@parent, item1)
     next unless can_view
+
     html << "  <li class='menu1-item'>#{link_4menu(item1)}</li>\n"
   end
   html << '</ul></div>'

data/app/renderers/dc_menu_renderer.rb

@@ -55,7 +55,7 @@ def find_selected
     top_menu_id = @parent.page.menu_id.split(';')[1] if @parent.page.menu_id.match(';')
     ret = @menu.dc_menu_items.find(top_menu_id)
   end
-# return first if not found (something is wrong)
+  # return first if not found (something is wrong)
   ret ||= @menu.dc_menu_items[0]
 end
 
@@ -64,50 +64,11 @@ end
 ########################################################################
 def link_4edit(opts) #:nodoc:
   html = ''
-#  return html unless @opts[:edit_mode] > 1
-
   opts.merge!( { controller: 'cmsedit', action: 'edit' } )
   title = "#{t('drgcms.edit')}: "
   opts[:title] = "#{title} #{opts[:title]}"
   
-  html << '<li>'+dc_link_for_edit(opts)+'</li>'
-end
-
-########################################################################
-# Returns html code required to create single link in a menu. Subroutine of do_menu_level.
-########################################################################
-def link_4menu(item)
-# prepand to link  
-  link = if !item.link_prepend.blank?
-    item.link_prepend
-  elsif !@menu.link_prepend.blank?
-    @menu.link_prepend
-  else
-    ''
-  end
-  
-  if item.link.match('http')
-    link = item.link
-  else
-    link += (item.link[0] == '/' ? '' : '/') + item.link
-    link  = '/' + link unless link[0] == '/'   # link should start with '/'
-  end
-
-  target = item.target.blank? ? nil : item.target
-# - in first place won't write caption text
-  caption   = item.caption[0] == '-' ? '' : item.caption.to_s
-  img_title = item.caption.to_s.sub('-','')
-# add picture if picture is not blank
-  html = ''
-  if !item.picture.blank?
-    if item.picture[0,3] == 'fa-' 
-      caption << @parent.fa_icon(item.picture[3,20])
-    else
-      html = @parent.link_to( @parent.image_tag(item.picture), link, {title: img_title, target: target} ) rescue ''
-    end
-  end
-  html << @parent.link_to(caption.html_safe, link, {target: target}) unless caption.blank?
-  html
+  html << "<li>#{dc_link_for_edit(opts)}</li>"
 end
 
 ########################################################################
@@ -117,9 +78,9 @@ end
 # [item] MenuItem.
 ########################################################################
 def link_4menu(item)
-# just horizontal line
+  # just horizontal line
   return item.caption if item.caption == '<hr>'
-# prepand to link  
+  # prepand to link
   link = if !item.link_prepend.blank?
     item.link_prepend
   elsif !@menu.link_prepend.blank?
@@ -160,27 +121,29 @@ end
 ########################################################################
 # Creates HTML code required for submenu on single level. Subroutine of default.
 ########################################################################
-def do_menu_level(menu, options={})
+def do_menu_level(menu, options = {})
   html = "<ul>"
   if @opts[:edit_mode] > 1
     options[:title] = menu.respond_to?('name') ? menu.name : menu.caption # 1. level or submenus
-    options[:id] = menu._id
+    options[:id]    = menu._id
     html << link_4edit(options)
   end
-# sort items acording to :order  
+  # sort items according to :order
   menu.dc_menu_items.order_by(order: 1).each do |item|
     next unless item.active
-# menu can be hidden from user    
+    # menu can be hidden from user
     can_view, msg = dc_user_can_view(@parent, item)
     next unless can_view
-    
-    html << if item.id == @selected.id 
-      "<li class=\"menu-selected\">#{ link_4menu(item) }"
-    else
-      "<li>#{ link_4menu(item) }"
-    end
-# do submenu    
-    if (sub = item.dc_menu_items).size > 0
+
+    html << if @opts[:path]&.include?(item.link)
+              %(<li class="menu-selected">#{ link_4menu(item) })
+            elsif item.id == @selected.id
+              %(<li class="menu-selected">#{ link_4menu(item) })
+            else
+              "<li>#{ link_4menu(item) }"
+            end
+    # do submenu
+    if item.dc_menu_items.size > 0
       if @opts[:edit_mode] > 1
         opts = options.clone
         opts['ids']   = (opts['ids']   ? "#{opts['ids']};" : '')   + menu._id.to_s
@@ -199,12 +162,12 @@ end
 ########################################################################
 def default
   return "(#{@opts[:name]}) menu not found!" if @menu.nil?
-#  
+
   @selected = find_selected
   html = ''
-  html << "<div id='#{@menu.div_name}'>" unless @menu.div_name.blank?  
+  html << "<div id='#{@menu.div_name}'>" if @menu.div_name.present?
   html << do_menu_level(@menu, table: 'dc_menu')
-  html << "</div>" unless @menu.div_name.blank? 
+  html << "</div>" if @menu.div_name.present?
   html
 end
 

data/app/renderers/dc_simple_menu_renderer.rb

@@ -162,8 +162,8 @@ def as_responsive
   items.each do |item|
 # menu can be hidden from user
     can_view, msg = dc_user_can_view(@parent, item)
-    p msg unless can_view
     next unless can_view
+
     html << "<li class=\"#{klas}#{(item.id == @selected.id) ? 'selected' : 'item'}\">#{ link_4menu(item) }</li>" #
   end
   html

data/app/views/cmsedit/_edit_stuff.html.erb

@@ -35,6 +35,9 @@
             {controller: 'dc_common', action: 'paste_clipboard'}, target: 'iframe_cms') %>
 
         <%= DrgcmsFormFields::Elfinder.file_manager_url(self) %>
+        <span>|</span>
+
+        <%= link_to(session[:user_name], '/cms/logout', { title: t('drgcms.logout') }) %>
 
       </div>
     </div>

data/config/locales/drgcms_en.yml

@@ -40,6 +40,7 @@ en:
     doc_paste_update: Update existing document if document._id exists
     doc_no_delete: Document can not be deleted!
     doc_no_update: Document can not be updated!
+    doc_no_edit: Document can not be edited!
     edit_content: Edit content
     edit_advanced: Advanced edit
     edit_new_page: Create new page
@@ -53,11 +54,13 @@ en:
     menu_plus: Show alternative menu
     not_email: is not valid e-mail address!
     updated_by_other: Document was updated by other user. Please reenter your data.
+    dfs: Double submit error! Returning back in history is prohibited.
     not_id: Value entered is not ID!
     cms_main: CMS main tables
     cms_advanced: CMS advanced
     search_placeholder: Start typing to search
     login: Login into CMS
+    logout: Logout
     username: User name
     password: Password
     form_error: Error loading form %{form_name}
@@ -99,6 +102,9 @@ en:
     errors_no: 'No. of errors:'
     runtime_error: Runtime error!
     two_chars: type in at least two chars
+    print: Print
+    export: Export
+    result: Result
 
     created_by: Created by
     updated_by: Updated by
@@ -118,6 +124,8 @@ en:
     category_has_subs: Category can't be deleted, because it contains sub-elements.
     category_as_tree: Edit in treeview
 
+    iframe_save_to_view: Data must be saved in order to view content
+
     dc_journal:
       zero_selected: No data selected!
       restored: Data has been restored.      

data/config/locales/drgcms_sl.yml

@@ -32,17 +32,18 @@ sl:
     not_authorized: Uporabnik nima pravic za to operacijo!
     doc_disabled: Dokument onemogočen!
     doc_enabled:  Dokument omogočen!
-    doc_saved: Dokument zapisan!
-    doc_info: Info  
-    doc_copy_clipboard: Kopija vsebine dokumenta v novem oknu.
-    doc_paste_clipboard: Obdelaj podatke    
+    doc_paste_clipboard: Obdelaj podatke
     doc_paste_title: Ustvari (spremeni) dokumente iz JSON zapisa
     doc_paste_update: Spremeni obstoječ dokument, če dokument._id obstaja
     doc_no_delete: Dokumenta ni možno izbrisati!
     doc_no_update: Dokumenta ni možno spremeniti!
+    doc_no_edit: Dokumenta ni možno urejati!
     edit_content: Urejanje vsebine
     edit_advanced: Napredno urejanje
     edit_new_page: Ustvarite novo stran
+    doc_saved: Dokument zapisan!
+    doc_info: Info  
+    doc_copy_clipboard: Kopija vsebine dokumenta v novem oknu.
     edit_new_part: Ustvarite nov element na strani
     edit_design: 'Uredi: Dizajn'
     edit_site: 'Uredi: Spletišče'
@@ -53,11 +54,13 @@ sl:
     menu_plus: Malo drugačen menu
     not_email: ni veljaven e-naslov!
     updated_by_other: Dokument je spremenil drug uporabnik. Prosimo ponovite vpis podatkov.
+    dfs: Dvojno shranjevanje. Vračanje v zgodovino brskalnika ni dovoljeno.
     not_id: Vsebina polja ni ključ ID! 
     cms_main: CMS tabele
     cms_advanced: CMS napredne opcije   
     search_placeholder: Vpišite pojem za iskanje
     login: Prijava v CMS
+    logout: Odjava
     username: Uporabnik
     password: Geslo
     form_error: Napaka pri branju forme %{form_name}
@@ -99,6 +102,9 @@ sl:
     errors_no: 'Število napak:'
     runtime_error: Napaka med izvajanjem programa!
     two_chars: vpišite vsaj dva znaka
+    print: Tiskanje
+    export: Izvoz
+    result: Rezultat
 
     created_by: Ustvaril
     updated_by: Spremenil
@@ -118,6 +124,8 @@ sl:
     category_has_subs: Kategorije ni mogoče izbrisati, ker vsebuje podrejene elemente.
     category_as_tree: Uredi v drevesnem pogledu
 
+    iframe_save_to_view: Za prikaz vsebine je potrebno predhodno shraniti podatke.
+
     dc_journal:
       zero_selected: Ni izbranih podatkov!
       restored: Podatki so restavrirani.

data/config/locales/models_en.yml

@@ -590,7 +590,17 @@ en:
         categories_line: Categories
         created_by: Uploaded by
 
-# help for forms #####################################################
+      dc_setup:
+        tabletitle: Applications settings
+        tab0: Options
+        tab00: Form
+
+        name: Setup name
+        form: Form
+        data: Data
+        editors: Editors
+
+# help for forms ##############################################################################################
 
     help:
       dc_site:
@@ -1006,3 +1016,9 @@ en:
         size_s: Dimension for small size image
         categories: Categories for later searching of image
         created_by: Image was uploaded by
+
+      dc_setup:
+        name: Setup name (typically application or module name)
+        form: Form definition for entering settings. Edit fields must be defined on tabs
+        data: Actual data saved
+        editors: List of users, which can edit this setup beside administrators

data/config/locales/models_sl.yml

@@ -604,6 +604,16 @@ sl:
         categories_line: Kategorije
         created_by: Naložil
 
+      dc_setup:
+        tabletitle: Tabela nastavitev aplikacij
+        tab0: Nastavitve
+        tab00: Form
+
+        name: Naziv nastavitev
+        form: Obrazec za zajem
+        data: Vsebina
+        editors: Urejevalci
+
 # help pomoč na obrazcih ####################################################
 
     help:
@@ -1027,4 +1037,10 @@ sl:
         size_s: Dimenzije male slike
         categories: Kategorije za poznejše lažje iskanje slike
         created_by: Uporabnik, ki je naložil sliko
-        offset: Offset image before resizing. Offset origin is the top left corner.
+        offset: Offset image before resizing. Offset origin is the top left corner.
+
+      dc_setup:
+        name: Naziv nastavitev (tipično ime aplikacije, modula)
+        form: Definicija posamezne nastavitve in obrazec za zajem
+        data: Vsebina nastavitev (kot je shranjena v bazi podatkov)
+        editors: Seznam zaposlenih, ki lahko poleg administratorjev urejajo zapis

data/lib/drg_cms/version.rb

@@ -23,5 +23,5 @@
 
 # drg_cms gem version
 module DrgCms #:nodoc:
-  VERSION = '0.7.0.8'.freeze
+  VERSION = '0.7.1.1'.freeze
 end

data/lib/drg_cms.rb

@@ -27,7 +27,7 @@ end
 
 ###############################################################################
 # When new plugin with its own DRG forms is added to application, path to
-# forms directory must be send to DrgCms module. Paths are saved into @@paths hash variable. 
+# forms directory must be send to DrgCms module. Paths are saved into internal @@paths variable.
 # 
 # Adding path is best done in plugin module initialization code.
 # 
@@ -40,17 +40,14 @@ end
 #    module MyPlugin
 #    end
 #
-#    DrgCms.add_forms_path File.expand_path("../../app/forms", __FILE__)
+#    DrgCms.add_forms_path(Rails.root.join('app/forms'), Rails.root.join('app/reports/forms'))
 ###############################################################################
-def self.add_forms_path(path) 
+def self.add_forms_path(*paths)
   if @@paths[:forms].nil?
-    @@paths[:forms] = []
-# default application forms path
-#    @@paths[:forms] << Rails.root.join('app/forms')
-# DrgCms forms path
-    @@paths[:forms] << File.expand_path("../../app/forms", __FILE__)
+    # DrgCms own forms path by default
+    @@paths[:forms] = [File.expand_path("../../app/forms", __FILE__)]
   end
-  @@paths[:forms] << path  
+  @@paths[:forms] += paths
 end
 
 ###############################################################################
@@ -77,8 +74,6 @@ end
 ###############################################################################
 def self.add_patches_path(path)
   self.add_path(:patches, path)
-#  Dir["#{path}/**/*.rb"].each { |path| p path; require_dependency path }
-#  Dir["#{path}/**/*.rb"].each { |file| p file; require file }
 end
 
 ###############################################################################
@@ -183,14 +178,18 @@ end
 # @return [Object] Data returned from cache
 ####################################################################
 def self.cache_read(keys)
-  if redis_cache_store?
-    keys  = keys.dup
-    first = keys.shift
-    data  = Rails.cache.redis.hget(first, keys.join(''))
-    data ? Marshal.load(data) : nil
-  else
-    Rails.cache.read(keys.join(''))
-  end
+  data = if redis_cache_store?
+           tmp_keys  = keys.dup
+           first_key = tmp_keys.shift
+           cached    = Rails.cache.redis.hget(first_key, tmp_keys.join(''))
+           cached ? Marshal.load(cached) : nil
+         else
+           Rails.cache.read(keys.join(''))
+         end
+  return data if data
+  return nil unless block_given?
+
+  self.cache_write(keys, yield)
 end
 
 ####################################################################
@@ -203,9 +202,9 @@ end
 ####################################################################
 def self.cache_write(keys, data)
   if redis_cache_store?
-    keys  = keys.dup
-    first = keys.shift
-    Rails.cache.redis.hset(first, keys.join(''), Marshal.dump(data))
+    tmp_keys  = keys.dup
+    first_key = tmp_keys.shift
+    Rails.cache.redis.hset(first_key, tmp_keys.join(''), Marshal.dump(data))
   else
     Rails.cache.write(keys.join(''), data)
   end
@@ -222,7 +221,7 @@ end
 # @return [Object] data document.
 ####################################################################
 def self.cached(model, id)
-  Mongoid::QueryCache.cache { model.find(id) }
+  id ? Mongo::QueryCache.cache { model.find(id) } : nil
 end
 
 ###############################################################################

data/lib/generators/new_drg_form/new_drg_form_generator.rb

@@ -147,22 +147,24 @@ end
 ###########################################################################
 #
 ###########################################################################
-def form_field(field, index, offset)
-  helper = I18n.t("helpers.label.#{@file_name}.choices4_#{field}")
+def form_field(field_name, index, offset, field_type)
+  helper = I18n.t("helpers.label.#{@file_name}.choices4_#{field_name}")
   type, eval = 'select',''
-  if helper.class == Hash or helper.match( 'translation missing' )
-    if field[-3,3] == '_id'
-      eval = "eval: dc_choices4('#{field[0,field.size-3]}','change_to_description_field_name','_id')\n"
+  if helper.class == Hash || helper.match( 'Translation missing' )
+    if field_name[-3, 3] == '_id'
+      eval = "eval: dc_choices4('#{field_name[0, field_name.size - 3]}', 'description_field_name', 'id')\n"
+    elsif field_type.match('Boolean')
+      type = 'check_box'
     else
       type = 'text_field'
     end
   end
-#
+
   yml = ' '*offset
   yml << "#{index}:\n"
   offset += 2
-#
-  yml << ' '*offset + "name: #{field}\n"
+
+  yml << ' '*offset + "name: #{field_name}\n"
   yml << ' '*offset + "type: #{type}\n"
   yml << ' '*offset + eval if eval.size > 0
   yml << ' '*offset + "size: 50\n" if type == 'text_field'
@@ -196,40 +198,56 @@ end
 #
 ###########################################################################
 def form_fields_options
-  forbidden = ['_id','created_by','updated_by','created_at','updated_at']
+  forbidden = %w[_id created_by updated_by created_at updated_at]
   tab_index = 1
   field_index = 0
   if options.tabs? 
     yml = "  tabs:\n"
-    @model.attribute_names.each do |attr_name|
+    @model.fields.each do |attr_name, field|
       next if forbidden.include?(attr_name)
+
       if field_index%100 == 0
         yml << "    tab#{tab_index}:\n"
         field_index = 0
         tab_index += 1
       end
       field_index += 10
-      yml << form_field(attr_name, field_index, 6)
+      yml << form_field(attr_name, field_index, 6, field.options[:type].to_s)
     end
     yml << "    tab#{tab_index}:\n"
     yml << embedded_form_field(6)
+
   else  
     yml = "  fields:\n"
-    @model.attribute_names.each do |attr_name|
+    @model.fields.each do |attr_name, field|
       next if forbidden.include?(attr_name)
+
       field_index += 10      
-      yml << form_field(attr_name, field_index, 4)
+      yml << form_field(attr_name, field_index, 4, field.options[:type].to_s)
     end
     yml << embedded_form_field(4)
   end
   yml
 end
 
+###########################################################################
+#
+###########################################################################
+def xform_fields_options
+  forbidden = %w[_id created_by updated_by created_at updated_at]
+  tab_index = 1
+  field_index = 0
+  @model.fields.each do |name, field|
+    pp [name, field.options[:type].to_s]
+    #pp [name, type]
+  end
+end
+
 ###########################################################################
 #
 ###########################################################################
 def localize_options
-  forbidden = ['_id','created_by','updated_by','created_at','updated_at']
+  forbidden = %w[_id created_by updated_by created_at updated_at]
   yml =<<EOT
   
 #################################################################

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.7.0.8
+  version: 0.7.1.1
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-02 00:00:00.000000000 Z
+date: 2024-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -223,6 +223,7 @@ files:
 - app/controls/dc_page_control.rb
 - app/controls/dc_poll_result_control.rb
 - app/controls/dc_report.rb
+- app/controls/dc_setup_control.rb
 - app/controls/design_element_settings_control.rb
 - app/forms/all_options.yml
 - app/forms/cms_forms.yml
@@ -264,6 +265,7 @@ files:
 - app/forms/dc_poll_result_export.yml
 - app/forms/dc_removed_url.yml
 - app/forms/dc_seo.yml
+- app/forms/dc_setup.yml
 - app/forms/dc_simple_menu.yml
 - app/forms/dc_simple_menu_item.yml
 - app/forms/dc_site.yml
@@ -320,6 +322,7 @@ files:
 - app/models/dc_poll_item.rb
 - app/models/dc_poll_result.rb
 - app/models/dc_removed_url.rb
+- app/models/dc_setup.rb
 - app/models/dc_simple_menu.rb
 - app/models/dc_simple_menu_item.rb
 - app/models/dc_site.rb