drg_cms 0.5.52.7 → 0.5.52.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14e0c13f818cd5c883d7a2ebe8e5a677b6603579
-  data.tar.gz: 12f30b353bd1347d739f6cf13c6dc44fef46c4aa
+  metadata.gz: 40fa56fbdb21a8a10e26ebeefc4f9ebf1a0a41d3
+  data.tar.gz: f3c627f7e59044e1826d120174b91c06d7d0ee25
 SHA512:
-  metadata.gz: 96bd289df2c2b236a3bf68e51e9b70965a6cc11353c802ea6c4a0c3140f4bb8bdfcf1e7d8edab681a1964ee8a9cd40da7e74d7447bb088ef455c989434352b51
-  data.tar.gz: 43c1445d8b6ae652a6b05070ad12475a4beddbc5b02ab6d61998031eb0e2d5e1c93dbd11c938e8e6b4353d4833b405993436f9680823d55b8e3a1334e4a1c52a
+  metadata.gz: 377369ee96b9fa738a115e607d3e187ab5a1bb951ea767add202be5cc3e3d1ef9f83f39a03ce8411c8c3fc86889c7d250e4f22c2ee51448b90b1ecc0492b0942
+  data.tar.gz: 2db3772bf7c84abf8a316eb3519f74e86b0d2a2925214f6e8a2a328f2b683ef6fa67df3d56cc4363d2481c7de9e77b030d2481c49ebe720e28a7d43623052f7e

data/app/assets/stylesheets/drg_cms/drg_cms.css

@@ -253,6 +253,7 @@ font-size: 0.9rem;
 /*  border-bottom: 2px solid #222; */
   color: #000;
   font-weight: bold;
+  background-color: #ddd;
 }
 
 .dc-menu {
@@ -467,12 +468,6 @@ border: 1px solid #ddd;
   width: 99.9%;
   margin: 0px;
   background-color: #fff;
-/*  
-  
-  border-radius: 1px;
-  border-top:1px solid #fff;
-  border-left:1px solid #fff;
-  border-bottom:1px solid #ccc;*/
 }
 
 .dc-form {

data/app/controllers/cmsedit_controller.rb

@@ -185,6 +185,7 @@ def check_filter_options() #:nodoc:
   site_id = dc_get_site._id if dc_get_site
 # dont't filter site if no dc_site_id field or user is ADMIN
   site_id = nil if !model.method_defined?('dc_site_id') or dc_user_can(DcPermission::CAN_ADMIN)
+  site_id = nil if session[table_name][:filter].to_s.match('dc_site_id')
 #  
   if @records = DcFilter.get_filter(session[table_name][:filter])
     @records = @records.and(dc_site_id: site_id) if site_id
@@ -239,7 +240,7 @@ def index
         @records = @records.page(params[:page]).per(per_page) if per_page > 0
       end
     else
-      p "Error: result_set:filter: #{@form['result_set']['filter']} not found in controls!"
+      Rails.logger.error "Error: result_set:filter: #{@form['result_set']['filter']} not found in controls!"
     end
   else
     if @tables.size > 1 
@@ -412,12 +413,14 @@ def create
     create_new_empty_record
     params[:return_to] = 'index' if params[:commit] == t('drgcms.save&back') # save & back
     if save_data
-      @parms['action'] = 'update'
-      @parms['id'] = @record.id     # must be set, for proper update link
-      flash[:info] = t('drgcms.doc_saved')
+      flash[:info]    = t('drgcms.doc_saved')
       return process_return_to(params[:return_to]) if params[:return_to]
-      render action: :edit
-    else
+      
+      @parms['id']     = @record.id     # must be set, for proper update link
+      params[:id]      = @record.id     # must be set, for find_record
+      edit
+      #      render action: :edit
+    else # error
       render action: :new
     end
   else # duplicate record
@@ -443,6 +446,7 @@ def edit
     return index if ret.class == FalseClass
   end  
   @parms['action'] = 'update'
+  render action: :edit
 end
 
 ########################################################################
@@ -472,7 +476,7 @@ def update
   else
     flash[:error] = t('drgcms.not_authorized')
   end
-  render action: :edit
+  edit
 end
 
 ########################################################################

data/app/controllers/dc_application_controller.rb

@@ -322,12 +322,14 @@ def dc_process_default_request()
   @js, @css = '', ''
 # find domain name in sites
   @site = dc_get_site
-# site is not defined. render 404 error
+# site not defined. render 404 error
   return dc_render_404('Site!') if @site.nil?
   dc_set_options(@site.settings)
 # HOMEPAGE. When no parameters is set
-  params[:path] = @site.homepage_link if params[:id].nil? and params[:path].nil?
-# some other process request. It shoud fail if not defined
+  params[:path]   = @site.homepage_link if params[:id].nil? and params[:path].nil?
+  @options[:path] = params[:path].split('/')
+  params[:path]   = @options[:path].first if @options[:path].size > 1
+# some other process request. It should fail if not defined
   return send(@site.request_processor) unless @site.request_processor.blank?
 
 # Search for page 

data/app/forms/dc_category.yml

@@ -14,11 +14,14 @@ result_set:
   columns:
     1:  
       name: name
+      width: 30%
     2: 
       name: updated_at
+      width: 10%
     3: 
       name: active
       eval: dc_icon4_boolean      
+      width: 10%
 
 form:
   title: 

data/app/forms/dc_menu.yml

@@ -17,9 +17,10 @@ result_set:
   columns:
     10:  
       name: name
+      width: 20%
     20: 
       name: description
-      width: 50%      
+      width: 80%      
 
 form:
   title: 

data/app/forms/dc_page.yml

@@ -113,6 +113,8 @@ form:
       25:
         name: _update_menu
         type: check_box
+        help: helpers.help.dc_page._update_menu
+        caption: helpers.label.dc_page._update_menu
 
       30:
         name: params

data/app/forms/dc_policy_rule.yml

@@ -15,6 +15,7 @@ result_set:
     1:  
       name: dc_policy_role_id
       eval: dc_name4_id,dc_policy_role,name
+      width: 30%
 
     2: 
       name: permission

data/app/forms/dc_policy_rule_nocms.yml

@@ -15,6 +15,7 @@ result_set:
     1:  
       name: dc_policy_role_id
       eval: dc_name4_id,dc_policy_role,name
+      width: 30%
 
     2: 
       name: permission

data/app/forms/dc_simple_menu.yml

@@ -17,6 +17,7 @@ result_set:
   columns:
     10:  
       name: name
+      width: 20%
     20: 
       name: description
       width: 50%

data/app/forms/dc_simple_menu_item.yml

@@ -35,44 +35,37 @@ form:
     10:
       name: caption
       type: text_field
-      html:
-        size: 30
+      size: 30
     20:
       name: picture
       type: file_select
-      html:
-        size: 50
+      size: 50
+      preview: no
     30:
       name: link_prepend
       type: text_field
-      html:
-        size: 20
+      size: 20
     40:
       name: link
       type: text_with_select
       eval: '@parent.dc_page_class.all_pages_for_site(@parent.dc_get_site)'
-      html:
-        size: 50
+      size: 50
     50:
       name: target
       type: text_field
-      html:
-        size: 10
+      size: 10
     60:
       name: order
       type: text_field
-      html:
-        size: 2
+      size: 2
     70:
       name: submenu
       type: text_area
-      html:
-        size: 60x20
+      size: 60x20
     80:
       name: css
       type: text_area
-      html:
-        size: 60x10
+      size: 60x10
     90:
       name: policy_id
       type: select

data/app/forms/dc_site.yml

@@ -17,9 +17,10 @@ result_set:
   columns:
     1:  
       name: name
+      width: 30%
     2: 
       name: description
-      width: 80%
+      width: 70%
 
 form:
   title: 

data/app/forms/dc_user.yml

@@ -17,10 +17,13 @@ result_set:
       name: username
     2:  
       name: first_name
+      width: 40%
     3: 
       name: last_name
+      width: 20%
     4: 
       name: last_visit
+      width: 10%
 
 form:
   title: 
@@ -34,66 +37,55 @@ form:
       10:
         name: username
         type: text_field
-        html:
-          size: 10
+        size: 10
       20:
         name: title
         type: text_field
-        html:
-          size: 5
+        size: 5
       30:
         name: first_name
         type: text_field
-        html:
-          size: 20
+        size: 20
 
       40:
         name: middle_name
         type: text_field
-        html:
-          size: 20
+        size: 20
 
       50:
         name: last_name
         type: text_field
-        html:
-          size: 20
+        size: 20
 
       60:
         name: company
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       70:
         name: address
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       80:
         name: post
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       90:
         name: country
         type: text_field
-        html:
-          size: 20
+        size: 20
 
       100:
         name: email
         type: text_field
-        html:
-          size: 30
+        size: 30
 
       110:
         name: phone
         type: text_field
-        html:
-          size: 30
+        size: 30
 
       120:
         name: birthdate
@@ -104,36 +96,30 @@ form:
       130:
         name: picture
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       140:
         name: about
         type: text_area
-        html:
-          size: 100x10
+        size: 100x10
 
       150:
         name: password
         type: password_field
-        html:
-          size: 20
+        size: 20
 
       160:
         name: password_confirmation
         type: password_field
-        html:
-          size: 20
+        size: 20
 
       170:
         name: dc_user_roles
         type: embedded
         form_name: dc_user_role
-        html:
-          size: 20
+        size: 20
 
       180:
         name: signature
         type: text_area
-        html:
-          size: 100x5
+        size: 100x5

data/app/helpers/cmsedit_helper.rb

@@ -30,6 +30,27 @@
 module CmseditHelper
   # javascript part created by form helpers
   attr_reader :js 
+  
+############################################################################
+# Get standard actions when actions directive contains single line.
+# Subroutine of dc_actions_for_index
+# 
+# Allows for actions: new, filter, standard syntax
+############################################################################
+def define_standard_actions(actions_params, standard)
+  actions = {}
+  actions_params.split(',').each do |an_action|
+    an_action.strip!
+    if an_action == 'standard'
+      actions.merge!(standard)
+    else
+      standard.each do |index, action| 
+        (actions[index] = action; break) if action == an_action
+      end
+    end
+  end 
+  actions
+end
 
 ############################################################################
 # Creates action div for cmsedit index action. 
@@ -38,13 +59,14 @@ def dc_actions_for_index()
   return '' if @form['index'].nil? or @form['readonly']
   actions = @form['index']['actions']
   return '' if actions.nil? or actions.size == 0
-# Simulate standard actions  
-  actions = {'standard' => true} if actions.class == String && actions == 'standard'
   std_actions = {2 => 'new', 3 => 'sort', 4 => 'filter' }
-  if actions['standard']
+  if actions.class == String
+    actions = define_standard_actions(actions, std_actions)
+  elsif actions['standard']
     actions.merge!(std_actions)
     actions['standard'] = nil
   end
+  
 # start div with hidden spinner image 
   html = <<EOT
 <div id="dc-action-menu">

data/app/helpers/dc_application_helper.rb

@@ -106,7 +106,7 @@ def dc_render(renderer, opts={})
     @css  << obj.render_css.to_s
     html.nil? ? '' : html.html_safe # nil can happened  
   else
-    "Class #{klass} not defined!"
+    I18n.t 'drgcms.no_class', class: klass
   end
 end
 
@@ -647,13 +647,13 @@ end
 # Returns: 
 # String. Translated text. 
 ####################################################################
-def t(key, default='')
+def t(key, default=nil)
   c = I18n.t(key)
   if c.class == Hash or c.match( 'translation missing' )
     c = I18n.t(key, locale: 'en') 
 # Still not found. Return default if set
     if c.class == Hash or c.match( 'translation missing' )
-      c = default.blank? ? key : default
+      c = default.nil? ? key : default
     end
   end
   c
@@ -923,12 +923,11 @@ def dc_choices4_cmsmenu()
  end
 #
   html = '<ul>'
-  menus.to_a.sort.each do |one_menu|    # sort menus, result is array of sorted hashes
-    menu = one_menu[1]                  # value is the second (1) element of array
+  menus.to_a.sort.each do |index, menu|    # sort menus, result is array of sorted hashes
     next unless menu['caption']
-    html << "<li class=\"cmsedit-top-level-menu\">#{fa_icon(menu['icon'])}#{t(menu['caption'])}<ul>"
-    menu['items'].to_a.sort.each do |item|          # as above. sort items first 
-      value = item[1]
+    icon = menu['icon'].match('/') ? image_tag(menu['icon']) : fa_icon(menu['icon']) #external or fa- image
+    html << "<li class=\"cmsedit-top-level-menu\">#{icon}#{t(menu['caption'])}<ul>"
+    menu['items'].to_a.sort.each do |index1, value|   # again, sort menu items first 
       html << if value['link']
         opts = { target: value['target'] || 'iframe_cms' }
         "<li>#{dc_link_to(t(value['caption']), value['icon'] || '', value['link'], opts)}</li>"

data/app/helpers/dc_menu_renderer.rb

@@ -40,9 +40,7 @@ include DcApplicationHelper
 ########################################################################
 def initialize( parent, opts ) #:nodoc:
   @parent = parent
-  @menu = opts[:name] ?
-    DcMenu.find_by(name: opts[:name].to_s) :
-    DcMenu.find(@parent.site.menu_id)
+  @menu = opts[:name] ? DcMenu.find_by(name: opts[:name].to_s) : DcMenu.find(@parent.site.menu_id)
   @opts = opts
   self
 end
@@ -105,11 +103,56 @@ def link_4menu(item)
     @parent.link_to(caption, link, {target: target}) )
 end
 
+########################################################################
+# Returns html code required for creating one link in a menu.
+# 
+# Parameters:
+# [item] MenuItem.
+########################################################################
+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
+
+  caption = ''
+  unless item.picture.blank? 
+    caption = case
+      when item.picture[0] == '@' then # call method
+        method = item.picture[1,100]   # remove leading @
+        return send(method) if respond_to?(method)
+        return @parent.send(method) if @parent.respond_to?(method)
+        return 'ERROR!'
+      when item.picture.match(/\./) then @parent.image_tag(item.picture)
+      when item.picture.match('<i') then item.picture
+      else
+        @parent.fa_icon(item.picture)
+    end
+    caption << ' '
+   end
+  # - in first place won't write caption text
+  caption = caption.html_safe + (item.caption[0] == '-' ? '' : item.caption.html_safe )
+  
+  target = item.target.blank? ? nil : item.target
+  @parent.link_to(caption, link, {target: target})
+end
+
 ########################################################################
 # Creates HTML code required for submenu on single level. Subroutine of default.
 ########################################################################
 def do_menu_level(menu, options={})
-  html = "<ul id=\"#{menu.name}\">"
+  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

data/app/helpers/dc_simple_menu_renderer.rb

@@ -102,8 +102,10 @@ def link_4menu(item)
   unless item.picture.blank? 
     caption = case
       when item.picture[0] == '@' then # call method
-        method = item.picture.sub('@','')
-        return eval(method) rescue 'ERROR!'
+        method = item.picture[1,100]   # remove leading @
+        return send(method) if respond_to?(method)
+        return @parent.send(method) if @parent.respond_to?(method)
+        return 'ERROR!'
       when item.picture.match(/\./) then @parent.image_tag(item.picture)
       when item.picture.match('<i') then item.picture
       else

data/app/models/concerns/dc_page_concern.rb

@@ -82,6 +82,13 @@ before_save :do_before_save
 validates :publish_date, presence: true
   
 ######################################################################
+# Will return subject_link. Field name link should be common for all documents
+# which can be found with links.
+######################################################################
+def link
+  subject_link
+end
+    
 protected
 
 ######################################################################

data/app/models/concerns/dc_user_concern.rb

@@ -88,7 +88,21 @@ def do_before_save
   self.name  = "#{self.title} #{self.first_name} #{self.middle_name + ' ' unless self.middle_name.blank?}#{self.last_name}".strip
 # to ensure unique e-mail            
   self.email = "unknown@#{self.id}" if self.email.to_s.strip.size < 5
-end  
+end
+
+##########################################################################
+# Checks if user has role 'role_id' defined in his roles
+##########################################################################
+def has_role?(role_id)
+  return false unless role_id
+#
+  unless BSON::ObjectId.legal?(role_id)
+    role    = DcPolicyRole.get_role(role_id)
+    role_id = role.id if role
+  end
+  role = self.dc_user_roles.where(dc_policy_role_id: role_id)
+  (role && role.active?)
+end
 
 ##########################################################################
 # Will return all possible values for country field ready for input in select field. 

data/app/models/dc_simple_menu.rb

@@ -119,7 +119,7 @@ end
 # 
 # Do nothing. The method is defined only for compatibility.
 #######################################################################
-def self.update_menu_item_link(path, link)
+def self.update_menu_item_link(document)
 end
 
 end

data/app/models/dc_user_role.rb

@@ -52,4 +52,13 @@ class DcUserRole
   field   :updated_by,        type: BSON::ObjectId
 
   embedded_in :dc_user
+  
+###############################################################################
+# Determine of role is still active
+###############################################################################
+def active?
+  now = Time.zone.local
+  self.active and (self.valid_from.nil? or now > self.valid_from) and (self.valid_to.nil? or now < self.valid_to)
 end
+
+end

data/app/models/drgcms_form_fields.rb

@@ -347,10 +347,15 @@ def render
 # 
   html = ''  
   @yaml['html'].each {|k,v| html << "#{k}=\"#{v}\" "}
-#  
-  tables      = @parent.tables.inject('') { |r,v| r << "#{v[1]};" } + @yaml['table']
-  ids         = @parent.ids.inject('') { |r,v| r << "#{v};" } + @record._id
-  opts = { controller: 'cmsedit', action: 'index', ids: ids, table: tables, form_name: @yaml['form_name'] || @yaml['form_name'], 
+# 
+  if @yaml['name'] == @yaml['table']
+    tables = @yaml['table']
+    ids = @record._id
+  else
+    tables      = @parent.tables.inject('') { |r,v| r << "#{v[1]};" } + @yaml['table']
+    ids         = @parent.ids.inject('') { |r,v| r << "#{v};" } + @record._id
+  end
+  opts = { controller: 'cmsedit', action: 'index', ids: ids, table: tables, form_name: @yaml['form_name'], 
            field_name: @yaml['name'], iframe: "if_#{@yaml['name']}", readonly: @readonly }
   @html << "<iframe class='iframe_embedded' id='if_#{@yaml['name']}' name='if_#{@yaml['name']}' #{html}></iframe>"
   @js = <<EOJS

data/config/locales/drgcms_en.yml

@@ -60,6 +60,7 @@ en:
     password: Password
     form_error: Error loading form #{form_name}
     img_large: Click for larger image
+    no_class: Class %{class} not defined!
     
     edit: Edit
     show: Prikaz

data/config/locales/drgcms_sl.yml

@@ -60,6 +60,7 @@ sl:
     password: Geslo
     form_error: Napaka pri branju forme #{form_name}
     img_large: Klik za večjo sliko
+    no_class: Class %{class} ni definiran!
 
     edit: Urejanje
     show: Prikaz

data/lib/drg_cms/version.rb

@@ -1,4 +1,4 @@
 module DrgCms #:nodoc:
   # drg_cms gem version
-  VERSION = "0.5.52.7"
+  VERSION = "0.5.52.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.52.7
+  version: 0.5.52.9
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -303,7 +303,6 @@ files:
 - app/models/dc_user_role.rb
 - app/models/dc_visit.rb
 - app/models/drgcms_form_fields.rb
-- app/views/cmsedit/__result.html.erb
 - app/views/cmsedit/_edit_stuff.html.erb
 - app/views/cmsedit/_form.html.erb
 - app/views/cmsedit/_result.html.erb
@@ -397,7 +396,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: 'DRG: Rapid web application development tool and CMS for Ruby, Rails and

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

@@ -1,20 +0,0 @@
-
-<div class="dc-table-frame">
-
-  <%= dc_table_title_for_result @records %>
-
-  <% unless @records.nil? %>
-      <%= dc_background_for_result(:start) %>
-  
-      <tr><%= dc_header_for_result %></tr>
-      <% for document in @records %>
-        <%= dc_row_for_result(document) %>
-        <%= dc_actions_for_result(document) %>
-        <%= dc_columns_for_result(document) %>
-        </tr>
-      <% end %>
-        
-      <%= dc_background_for_result(:end) %>
-  <% end %>
-  
-</div>