drg_cms 0.5.52.2 → 0.5.52.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac624231414ec0d8f5dfcb2f87623189fa9558d3
-  data.tar.gz: 4da97b7be20ae7ba6641127a8fa9e1de2f03d84d
+  metadata.gz: 6cd8a24b6fe78291f0381645570f80c9f37f02a2
+  data.tar.gz: ae23416b365aad2e19b2a7d06db7d474f6522359
 SHA512:
-  metadata.gz: 075acb47b95998834a156fa11543c0ed7a9f4dc4292257c144c99e932fac779552a3b8063daf9649797a064f000d6ca001c08362d7bde740c3c316fc96c916fe
-  data.tar.gz: ef960025a10da97bd10cd942793567d313c1cdbcfe30c50fa02479c70cd058c52f4401dd4e5e60fb0a62b01634cbbfe1587f21b25b35904cc96cb1a894171301
+  metadata.gz: 3be8e8ecade1f23a24678a1fb06cf0591407b4108435c4e559fefed4d1524f2a134f10c86db5c34744fe8cf9750927b0e05ab115d25a75b9a48dd7562730e868
+  data.tar.gz: 62e72cfd6235f0965eca6936114a9a706d870aaf59ad59e79d33ac5addfab728c18041cfa7edd7771ebe74a5fb6a294dacbf4c26b8264ee303bc89d3d9a89384

data/README.md

@@ -1,12 +1,12 @@
 # DrgCms
 
-DRG CMS is alternative way of programming application for Ruby on Rails. Instead of creating controllers and views for each collection (table) model, DRG CMS introduces single Cmsedit controller which uses DRG Forms to control CRUD database operations. 
+DRG CMS is advanced way of programming application for Ruby on Rails. Instead of creating controllers and views for each collection (table) model, DRG CMS introduces single Cmsedit controller which uses DRG Forms to control CRUD database operations. 
  
 DRG CMS uses Mongo DB, leading NO-SQL document database, as database back-end with a help of mongoid gem. Mongoid's flexible document model defines all document fields, indexes, dependencies, validations in single model file with no Rails migrations required.
 
 DRG CMS can be used for rapid development of complex, data-entry intensive web sites as well as building your private, in-house, Intranet applications.
 
-DRG CMS has built-in user friendly role based access system and it can be easly extended with help of Ruby on Rails plugin system.
+DRG CMS has built-in user friendly role based database access system and can be easly extended with help of Ruby on Rails plugin system.
 
 Project Tracking
 ----------------
@@ -16,9 +16,9 @@ Project Tracking
 Compatibility
 -------------
 
-DRG CMS is tested against Ruby 2.2 and higher, Rails 5.0 and higher, Mongoid 6, MongoDB 3.0, 3.2
+DRG CMS is tested against Ruby 2.2 and higher, Rails 5.0 and higher, Mongoid 6, MongoDB 3.0, 3.2, 3.4
 
-Version from 0.5.51 and higher require Ruby 2.3 and Rails 5.1
+Version from 0.5.51 and higher requires Ruby 2.4.x and Rails 5.1.x
 
 Documentation
 -------------
@@ -29,7 +29,7 @@ Please see the DRG CMS website for up-to-date documentation:
 License (MIT LICENCE)
 ---------------------
 
-Copyright (c) 2012-2017 Damjan Rems
+Copyright (c) 2012-2018 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/assets/stylesheets/drg_cms/drg_cms.css

@@ -707,25 +707,21 @@ background-color: lightyellow;
 }
 
 #dc-login {
-/*  
-position: relative;
-text-align: left;
-bottom: 0px;
-right: 0px;
-*/
-display: inline-block;
-position: fixed;
-top: 0;
-bottom: 0;
-left: 0;
-right: 0;
-width: 250px;
-height: 100px;
-padding: 10px;
-margin: auto;
-background-color: #fff;
-border: 1px solid #888;
-box-shadow: 1px 1px 4px #888;
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  font-size: 1.2em;
+  padding: 0 5em 1em 1em;
+  border: 1px solid #669;
+  box-shadow: 0px 0px 5px #666;
+}
+#dc-login h2 {
+  font-weight: bold;
+  font-size: 1.4em;
+}
+#dc-login .label {
+  padding: 5px 0px;
 }
 
 .div-hidden {

data/app/controllers/cmsedit_controller.rb

@@ -584,8 +584,9 @@ def read_drg_cms_form
   ids = params[:ids].to_s.strip.downcase
   @ids = ids.split(';').inject([]) { |r,v| r << v }
 # formname defaults to last table specified
-  formname = params[:formname] || @tables.last[1]
-  @form  = YAML.load_file( dc_find_form_file(formname) )
+  dc_deprecate("Parameter :formname will be deprecated in future. Use :form_name instead") if params[:formname]
+  form_name = params[:formname] || params[:form_name] || @tables.last[1]
+  @form  = YAML.load_file( dc_find_form_file(form_name) )
 # when form extends another form file. 
   if @form['extend']
     form = YAML.load_file( dc_find_form_file(@form['extend']) )
@@ -599,7 +600,7 @@ def read_drg_cms_form
 # add readonly key to form if readonly parameter is passed in url
   @form['readonly'] = 1 if params['readonly'] #and %w(1 yes true).include?(params['readonly'].to_s.downcase.strip)
 # !!!!!! Always use strings for key names since @parms['table'] != @parms[:table]
-  @parms = { 'table' => table_name, 'ids' => params[:ids], 'formname' => formname,
+  @parms = { 'table' => table_name, 'ids' => params[:ids], 'form_name' => form_name,
              'return_to' => params['return_to'], 'edit_only' => params['edit_only'],
              'readonly' => params['readonly'] 
            }
@@ -610,7 +611,7 @@ end
 # load DRG form.
 ############################################################################
 def check_authorization
-  params[:table] ||= params[:formname]
+  params[:table] ||= params[:formname] || params[:form_name]
 # Just show menu
 #  return show if params[:action] == 'show'
   return login if params[:id].in?(%w(login logout))
@@ -796,7 +797,8 @@ def save_data
             (params[:edit_only] and params[:edit_only] != v['name']) or # otherwise other fields would be wiped
             v['readonly'] or # fields with readonly option don't return value and would be wiped
             !@record.respond_to?(v['name']) # there can be temporary fields on the form
-# return value from form field definition
+    # good to know how to get type of field @record.fields[v['name']].type
+    # return value from form field definition
     value = DrgcmsFormFields.const_get(v['type'].camelize).get_data(params, v['name'])
     @record.send("#{v['name']}=", value)
   end

data/app/controllers/dc_application_controller.rb

@@ -564,6 +564,12 @@ def dc_reload_patches
   end
 end
 
-
+############################################################################
+# Writes out deprication msg. It also adds site_name to message, so it is easier to
+# find where the message is comming from.
+############################################################################
+def dc_deprecate(msg)
+  ActiveSupport::Deprecation.warn("#{dc_get_site.name}: #{msg}")
+end
 
 end

data/app/controllers/dc_page_control.rb

@@ -41,11 +41,13 @@ def dc_new_record()
 end
 
 ######################################################################
-# Caled just after record is saved to DB.
+# Called just after record is saved to DB.
 ######################################################################
 def dc_after_save()
-  menu_class = dc_get_site.menu_class.classify.constantize
-  menu_class.update_menu_item_link(@record.menu_id, @record.subject_link)
+  if params[:_record][:_update_menu] == '1'
+    menu_class = dc_get_site.menu_class.classify.constantize
+    menu_class.update_menu_item_link(@record)
+  end
 end
 
 end 

data/app/controllers/design_element_settings_control.rb

@@ -52,21 +52,16 @@ def get_settings()
   begin
     model = params[:location].classify.constantize    
   rescue 
-    flash[:error] = 'Invalid or undefined model name!'
+    flash[:error] = "Invalid or undefined model name! #{params[:location]}"
     return false    
   end
 # Check fild name 
   begin
     document = model.find(params[:id])
-    params[:field_name] = case
-      when params[:location] == 'dc_page' then 'params'
-      when params[:location] == 'dc_site' then 'options'
-      otherwise params[:field_name]
-    end  
+    params[:field_name] ||= (params[:location] == 'dc_site' ? 'options' : 'params')
 # field not defined on document   
     raise unless document.respond_to?(params[:field_name])
-    yaml = document[params[:field_name]]
-    yaml = '' if yaml.blank?
+    yaml = document[params[:field_name]] || ''
   rescue 
     flash[:error] = 'Invalid or undefined field name!'
     return false    

data/app/forms/all_options.yml

@@ -33,7 +33,7 @@ index:
       controller: controller_name
       action: action_name
       table: table_name
-      formname: form_name
+      form_name: form_name
     4: 
       type: menu
       eval: ModulClassName.menu_for(self)
@@ -69,7 +69,7 @@ result_set:
       controller: controller_name
       action: action_name
       table: table_name
-      formname: form_name
+      form_name: form_name
       target: target      
       method: (get),put,post      
 
@@ -188,7 +188,7 @@ form:
       20:
         name: dc_poll_items
         type: embedded
-        formname: dc_poll_item
+        form_name: dc_poll_item
         html:
           height: 800      
       20:

data/app/forms/cms_menu.yml

@@ -129,4 +129,4 @@ menu:
         controller: cmsedit
         icon: table lg        
         table: dc_memory
-        formname: dc_browse_models
+        form_name: dc_browse_models

data/app/forms/dc_big_table.yml

@@ -57,6 +57,6 @@ form:
     40:
       name: dc_big_table_values
       type: embedded
-      formname: dc_big_table_value
+      form_name: dc_big_table_value
       html:
         height: 600      

data/app/forms/dc_big_table_value.yml

@@ -46,6 +46,6 @@ form:
     30:
       name: dc_big_table_locales
       type: embedded
-      formname: dc_big_table_locale
+      form_name: dc_big_table_locale
       html:
         height: 300      

data/app/forms/dc_browse_models.yml

@@ -12,7 +12,7 @@ result_set:
   dblclick:
     type: link
     table: dc_memory
-    formname: dc_browse_fields
+    form_name: dc_browse_fields
     action: index
 
   columns:

data/app/forms/dc_design.yml

@@ -73,6 +73,6 @@ form:
       10:
         name: dc_parts
         type: embedded
-        formname: dc_part
+        form_name: dc_part
         html:
           height: 1000

data/app/forms/dc_folder_permission.yml

@@ -45,6 +45,6 @@ form:
       name: dc_policy_rules
       type: embedded
       table: dc_policy_rule
-      formname: dc_policy_rule_nocms
+      form_name: dc_policy_rule_nocms
       html:
         height: 400

data/app/forms/dc_menu.yml

@@ -62,7 +62,7 @@ form:
       10:
         name: dc_menu_items
         type: embedded
-        formname: dc_menu_item
+        form_name: dc_menu_item
         html:
           height: 1000
 

data/app/forms/dc_menu_item.yml

@@ -74,7 +74,7 @@ form:
       10:
         name: dc_menu_items
         type: embedded
-        formname: dc_menu_item
+        form_name: dc_menu_item
         html:
           height: 1000
 

data/app/forms/dc_page.yml

@@ -109,10 +109,9 @@ form:
         eval: '@parent.dc_menu_class.choices4_menu_as_tree(@record.dc_site_id)'        
         style: 'max-height: 300px'
 
-#      20:
-#        name: menu_id
-#        type: select
-#        eval: dc_choices4_menu
+      25:
+        name: _update_menu
+        type: check_box
 
       30:
         name: params
@@ -152,7 +151,7 @@ form:
       10:
         name: dc_parts
         type: embedded
-        formname: dc_part
+        form_name: dc_part
         html:
           height: 600
           

data/app/forms/dc_permission.yml

@@ -46,6 +46,6 @@ form:
       name: dc_policy_rules
       type: embedded
       table: dc_policy_rule
-      formname: dc_policy_rule_nocms
+      form_name: dc_policy_rule_nocms
       html:
         height: 400

data/app/forms/dc_policy.yml

@@ -50,7 +50,7 @@ form:
     60:
       name: dc_policy_rules
       type: embedded
-      formname: dc_policy_rule
+      form_name: dc_policy_rule
       html:
         height: 400
         

data/app/forms/dc_poll.yml

@@ -108,6 +108,6 @@ form:
       20:
         name: dc_poll_items
         type: embedded
-        formname: dc_poll_item
+        form_name: dc_poll_item
         html:
           height: 800      

data/app/forms/dc_simple_menu.yml

@@ -63,7 +63,7 @@ form:
       10:
         name: dc_simple_menu_items
         type: embedded
-        formname: dc_simple_menu_item
+        form_name: dc_simple_menu_item
         html:
           height: 800
 

data/app/forms/dc_site.yml

@@ -103,6 +103,10 @@ form:
         type: text_with_select
         eval: dc_choices4(@record.menu_class,'description','name')
         size: 30
+      70:
+        name: menu_id
+        type: select
+        eval: dc_choices4(@record.menu_class,'description','_id')
       90:
         name: settings
         type: text_area
@@ -141,14 +145,14 @@ form:
       20:
         name: dc_policies
         type: embedded
-        formname: dc_policy
+        form_name: dc_policy
         html:
           height: 800
     6parts:
       10:
         name: dc_parts
         type: embedded
-        formname: dc_part
+        form_name: dc_part
         html:
           height: 1000
           

data/app/forms/dc_user.yml

@@ -128,7 +128,7 @@ form:
       170:
         name: dc_user_roles
         type: embedded
-        formname: dc_user_role
+        form_name: dc_user_role
         html:
           size: 20
 

data/app/helpers/cmsedit_helper.rb

@@ -73,7 +73,8 @@ EOT
       url['controller'] = yaml['controller'] if yaml['controller']
       url['action']     = yaml['action'] || action
       url['table']      = yaml['table']  if yaml['table']
-      url['formname']   = yaml['formname'] if yaml['formname']
+      url['form_name']  = yaml['form_name'] if yaml['form_name']
+      url['form_name']  = yaml['formname']  if yaml['formname']
     end
 # html link options
     yhtml = yaml['html'] || {}
@@ -161,7 +162,7 @@ def dc_div_filter()
 
       </td>
       <td class="dc-link dc-animate drgcms_popup_submit" data-url="#{url}">#{fa_icon('check-square-o')} #{t('drgcms.filter_on')}</td>
-      <td class="dc-link dc-animate">#{dc_link_to('drgcms.filter_off','close', {action: :index, filter: 'off', table: @form['table'], formname: params['formname']}) }</td>
+      <td class="dc-link dc-animate">#{dc_link_to('drgcms.filter_off','close', {action: :index, filter: 'off', table: @form['table'], form_name: params['form_name']}) }</td>
     </table>
 </div>
 EOT
@@ -252,7 +253,8 @@ def dc_actions_for_result(document)
       parms['controller'] = yaml['controller'] if yaml['controller']
       parms['action']     = yaml['action']     if yaml['action']
       parms['table']      = yaml['table']      if yaml['table']
-      parms['formname']   = yaml['formname']   if yaml['formname']
+      parms['form_name']  = yaml['form_name']  if yaml['form_name']
+      parms['form_name']  = yaml['formname']   if yaml['formname']
       parms['target']     = yaml['target']     if yaml['target']
       dc_link_or_ajax(yaml, parms)
     else # error. 
@@ -290,7 +292,7 @@ def dc_header_for_result()
         if v['name'] == sort_field
           icon = sort_direction == '1' ? 'sort-alpha-asc lg' : 'sort-alpha-desc lg'
         end        
-        th << ">#{dc_link_to(caption, icon, sort: v['name'], table: params[:table], formname: params[:formname], action: :index )}</th>"
+        th << ">#{dc_link_to(caption, icon, sort: v['name'], table: params[:table], form_name: params[:form_name], action: :index )}</th>"
       else
         th << ">#{caption}</th>"
       end
@@ -311,7 +313,7 @@ def dc_clicks_for_result(document)
     opts[:controller] = yaml['controller'] || 'cmsedit'
     opts[:action]     = yaml['action']
     opts[:table]      = yaml['table']
-    opts[:formname]   = yaml['formname']
+    opts[:form_name]  = yaml['form_name'] || yaml['formname']
     opts[:method]     = yaml['method'] || 'get'
     opts[:id]         = document['id']
     html << ' data-dblclick=' + url_for(opts) 
@@ -319,7 +321,7 @@ def dc_clicks_for_result(document)
      html << (' data-dblclick=' +
        url_for(action: 'show', controller: 'cmsedit', id: document, 
        readonly: (params[:readonly] ? 2 : 1), table: params[:table],
-       formname: params[:formname], ids: params[:ids])  ) if @form['form'] 
+       form_name: params[:form_name], ids: params[:ids])  ) if @form['form'] 
   end
   html
 end
@@ -549,7 +551,7 @@ def dc_actions_for_form()
           parms['controller'] = v['controller'] 
           parms['action']     = v['action'] 
           parms['table']      = v['table'] 
-          parms['formname']   = v['formname'] 
+          parms['form_name']  = v['form_name'] || v['formname'] 
           parms['id']         = @record.id
   # additional parameters          
           v['params'].each { |k,v| parms[k] = v } if v['params']
@@ -561,7 +563,6 @@ def dc_actions_for_form()
           v['caption'] ||= v['text'] 
           caption = t("#{v['caption'].downcase}", v['caption'])
           url     = url_for(parms)
-          p url
           request = v['request'] || v['method'] || 'get'
           icon    = v['icon'] ? "#{fa_icon(v['icon'])} " : ''
           if v['type'] == 'ajax' # ajax button

data/app/helpers/dc_application_helper.rb

@@ -35,6 +35,10 @@ attr_reader :page
 attr_reader :design
 # site document
 attr_reader :site
+# menu document
+attr_reader :menu
+# selected menu_item document
+attr_reader :menu_item
 # tables url parameter
 attr_reader :tables
 # ids url parameter
@@ -65,7 +69,7 @@ end
 # find where the message is comming from.
 ############################################################################
 def dc_deprecate(msg)
-  logger.info "#{dc_get_site.name}: #{msg}"
+  ActiveSupport::Deprecation.warn("#{dc_get_site.name}: #{msg}")
 end
 
 ############################################################################
@@ -460,12 +464,12 @@ end
 # Will create HTML code required to create new document.
 # 
 # Parameters: 
-# [opts] Hash. Optional parameters for url_for helper. These options must provide at least table and formname
+# [opts] Hash. Optional parameters for url_for helper. These options must provide at least table and form_name
 # parameters. 
 # 
 # Example:
 #    if @opts[:edit_mode] > 1
-#      opts = {table: 'dc_page;dc_part', formname: 'dc_part', ids: @doc.id }
+#      opts = {table: 'dc_page;dc_part', form_name: 'dc_part', ids: @doc.id }
 #      html << dc_link_for_create( opts.merge!({title: 'Add new part', 'dc_part.name' => 'initial name', 'dc_part.order' => 10}) ) 
 #    end
 # 
@@ -477,7 +481,7 @@ def dc_link_for_create(opts)
   title = opts.delete('title') #
   title = t(title, title) if title
   target = opts.delete('target')  || 'iframe_cms'
-  opts['formname']   ||= opts['table'].split(';').last
+  opts['form_name']  ||= opts['formname'] || opts['table'].to_s.split(';').last
   opts['action']       = 'new'
   opts['controller'] ||= 'cmsedit'
   js = "$('##{target}').attr('src', '#{_origin.url_for(opts)}'); return false;"
@@ -490,7 +494,7 @@ end
 # 
 # Parameters: 
 # [opts] Hash. Optional parameters for url_for helper. These options must provide 
-# at least table, formname and id parameters. Optional title, target and icon parameters
+# at least table, form_name and id parameters. Optional title, target and icon parameters
 # can be set.
 # 
 # Example:
@@ -507,7 +511,7 @@ def dc_link_for_edit(opts)
   icon   = opts.delete('icon') || 'edit lg'
   opts['controller'] ||= 'cmsedit'
   opts['action']     ||= 'edit'
-  opts['formname']   ||= opts['table'].to_s.split(';').last
+  opts['form_name']  ||= opts['formname'] || opts['table'].to_s.split(';').last
   js  = "$('##{target}').attr('src', '#{_origin.url_for(opts)}'); return false;"
   dc_link_to(nil, _origin.fa_icon(icon, class: 'dc-inline-link'), '#', 
              { onclick: js, title: title, alt: 'Edit'})
@@ -547,7 +551,7 @@ end
 # * New part. Will create new part of document.
 # 
 # Parameters:
-# [opts] Hash. Optional parameters for url_for helper. These options must provide at least table and formname
+# [opts] Hash. Optional parameters for url_for helper. These options must provide at least table and form_name
 # and id parameters. 
 # 
 # Example:
@@ -563,7 +567,7 @@ def dc_page_edit_menu(opts=@opts)
   page  = opts[:page] || @page
   table = _origin.site.page_table
   kukis = { "#{table}.dc_design_id" => page.dc_design_id,
-            "#{table}.menu_id"      => page.menu_id,
+#            "#{table}.menu_id"      => page.menu_id,
             "#{table}.kats"         => page.kats,
             "#{table}.page_id"      => page.id,
             "#{table}.dc_site_id"   => _origin.site.id
@@ -573,7 +577,7 @@ def dc_page_edit_menu(opts=@opts)
   opts[:editparams] ||= {}
   dc_link_menu_tag(title) do |html|
     opts[:editparams].merge!( controller: 'cmsedit', action: 'edit', 'icon' => 'edit' )
-    opts[:editparams].merge!( :id => page.id, :table => _origin.site.page_table, formname: opts[:formname], edit_only: 'body' )
+    opts[:editparams].merge!( :id => page.id, :table => _origin.site.page_table, form_name: opts[:form_name], edit_only: 'body' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_content') )
     
 #    opts[:editparams][:edit_only] = nil
@@ -584,7 +588,7 @@ def dc_page_edit_menu(opts=@opts)
     opts[:editparams].merge!( action: 'new', 'icon' => 'plus' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_new_page') )
 
-    opts[:editparams].merge!(ids: page.id, formname: 'dc_part', 'icon' => 'plus-square-o', 
+    opts[:editparams].merge!(ids: page.id, form_name: 'dc_part', 'icon' => 'plus-square-o', 
                              table: "#{_origin.site.page_table};dc_part"  )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_new_part') )
   end.html_safe
@@ -919,13 +923,19 @@ def dc_choices4_cmsmenu()
     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]
-      opts = { controller: value['controller'], 
-               action: value['action'], 
-               table: value['table'],
-               formname: value['formname'] || value['table'],
-               target: value['target'] || 'iframe_cms'               
-             }
-      html << "<li>#{dc_link_to(t(value['caption']), value['icon'] || '', opts)}</li>"      
+      html << if value['link']
+        opts = { target: value['target'] || 'iframe_cms' }
+        "<li>#{dc_link_to(t(value['caption']), value['icon'] || '', value['link'], opts)}</li>"
+      else
+        opts =        
+        { controller: value['controller'], 
+          action: value['action'], 
+          table: value['table'],
+          form_name: value['form_name'] || value['formname'] || value['table'],
+          target: value['target'] || 'iframe_cms',
+        }
+        "<li>#{dc_link_to(t(value['caption']), value['icon'] || '', opts)}</li>"
+      end
     end   
     html << '</ul></li>'  
   end
@@ -1196,15 +1206,15 @@ end
 # Parameters:
 # [table] String: Collection (table) name used to load initial form.
 # [opts] Hash: Optional parameters which define url for loading DRG form.
-# These parameters are :action, :oper, :table, :formname, :id, :readonly
+# These parameters are :action, :oper, :table, :form_name, :id, :readonly
 # 
 # Example:
 #    # just iframe code
 #    <%= dc_iframe_edit(nil) %>
 #    # load note form for note collection
 #    <%= dc_iframe_edit('note') %>
-#    # on register collection use reg_adresses formname to display data with id @register.id
-#    <%= dc_iframe_edit('register', action: :show, formname: 'reg_adresses', readonly: 1, id: @register.id ) %>
+#    # on register collection use reg_adresses form_name to display data with id @register.id
+#    <%= dc_iframe_edit('register', action: :show, form_name: 'reg_adresses', readonly: 1, id: @register.id ) %>
 # 
 # Returns:
 # Html code for edit iframe
@@ -1215,7 +1225,7 @@ def dc_iframe_edit(table, opts={})
     params[:action]     = (params[:oper] and (params[:oper] == 'edit')) ? 'edit' : 'index'
     params[:action]     = opts[:action] unless params[:oper]
     params[:table]      ||= table 
-    params[:formname]   ||= opts[:formname] || table 
+    params[:form_name]  ||= opts[:form_name] || opts[:formname] || table 
     params[:id]         ||= params[:idp] || opts[:id]
     params[:readonly]   ||= opts[:readonly]
     params[:path]       = nil

data/app/helpers/dc_menu_renderer.rb

@@ -132,7 +132,7 @@ def do_menu_level(menu, options={})
         opts = options.clone
         opts['ids']   = (opts['ids']   ? "#{opts['ids']};" : '')   + menu._id.to_s
         opts['table'] = (opts['table'] ? "#{opts['table']};" : '') + 'dc_menu_item'
-        opts['formname'] = nil # must be
+        opts['form_name'] = nil # must be
       end
       html << do_menu_level(item, opts)
     end

data/app/helpers/dc_part_renderer.rb

@@ -141,7 +141,7 @@ def default
     parts.sort! {|a,b| a[0].order <=> b[0].order }
   
     parts.each do |part| 
-      @opts[:editparams].merge!( id: part[0], ids: "#{part[1]}", formname: part[2], table: part[3] )
+      @opts[:editparams].merge!( id: part[0], ids: "#{part[1]}", form_name: part[2], table: part[3] )
       html << render_particle(part[0], @opts) 
     end
   end
@@ -174,7 +174,7 @@ def in_page
   return "Error DcPart: Page not found!" if page.nil?
 #  
   if part = page.dc_parts.find_by(name: @opts[:name])
-    @opts[:editparams].merge!(id: part, ids: page._id, formname: 'dc_part', table: "#{@parent.site.page_table};dc_part" )
+    @opts[:editparams].merge!(id: part, ids: page._id, form_name: 'dc_part', table: "#{@parent.site.page_table};dc_part" )
     render_particle(part, @opts) 
   else
     "Part with name #{@opts[:name]} not found in page!"
@@ -195,7 +195,7 @@ def single_sitedoc
 # part not found. Render error message.
   return "Part #{@opts[:div_id]} not found!" if part.nil?
 # prepare edit parameters  
-  @opts[:editparams].merge!(id: part, ids: @parent.site._id, formname: 'dc_part', 
+  @opts[:editparams].merge!(id: part, ids: @parent.site._id, form_name: 'dc_part', 
                             table: "dc_site;dc_part", record_div_id: 'document' )
   render_particle(part, @opts) 
 end

data/app/helpers/dc_piece_renderer.rb

@@ -58,7 +58,7 @@ def link_4edit()
   html = ''
   return html if @opts[:edit_mode] < 2
   @opts[:editparams].merge!( { table: 'dc_piece', 
-                               formname: 'dc_piece', 
+                               form_name: 'dc_piece', 
                                controller: 'cmsedit', 
                                action: 'edit', 
                                id: @piece.id,

data/app/helpers/dc_poll_renderer.rb

@@ -162,7 +162,7 @@ def default
   html <<  "<div class=\"poll-div\">\n"
 # edit link  
   if @opts[:edit_mode] > 1
-    @opts[:editparams].merge!( controller: 'cmsedit', action: 'edit', id: poll._id, table: 'dc_poll', formname: 'dc_poll' )
+    @opts[:editparams].merge!( controller: 'cmsedit', action: 'edit', id: poll._id, table: 'dc_poll', form_name: 'dc_poll' )
     @opts[:editparams].merge!(title: "#{t('drgcms.edit')}: #{poll.name}")
     @opts[:editparams].delete(:ids) # this is from page, but it gets in a way
     html << dc_link_for_edit( @opts[:editparams] )

data/app/models/concerns/dc_page_concern.rb

@@ -70,8 +70,8 @@ field :policy_id,    type: BSON::ObjectId
 
 embeds_many :dc_parts
 
-belongs_to  :dc_site #,   optional: true
-belongs_to  :dc_design #, optional: true
+belongs_to  :dc_site,   optional: true
+belongs_to  :dc_design, optional: true
 
 index  ({ dc_site_id: 1, subject_link: 1 })
 index  kats: 1

data/app/models/concerns/dc_site_concern.rb

@@ -50,6 +50,7 @@ included do
   field :created_by,          type: BSON::ObjectId
   field :updated_by,          type: BSON::ObjectId  
   field :menu_name,           type: String
+  field :menu_id,             type: BSON::ObjectId
   field :settings,            type: String
   field :alias_for,           type: String  
   field :rails_view,          type: String,  default: ''
@@ -74,11 +75,26 @@ def params(what=nil)
   what.nil? ? @params : @params[what.to_s]
 end
 
+########################################################################
+# Returns class object of collection name
+########################################################################
+def page_klass()
+  (self.page_table.blank? ? self.page_class : self.page_table).classify.constantize
+end
+
+########################################################################
+# Returns class object of menu collection name
+########################################################################
+def menu_klass()
+  (self.menu_class.blank? ? 'DcMenu' : self.menu_class).classify.constantize
+end
+
 ########################################################################
 # Return choices for select for site_id
 ########################################################################
 def self.choices4_site
-  all.inject([]) { |r,site| r << [ (site.active ? '' : t('drgcms.disabled') ) + site.name, site._id] }
+  result = all.inject([]) { |r,site| r << [ (site.active ? '' : t('drgcms.disabled') ) + site.name, site._id] }
+  result.sort {|a,b| a[0] <=> b[0]}
 end
 
 ########################################################################

data/app/models/dc_ad.rb

@@ -81,7 +81,7 @@ class DcAd
   field :created_by,  type: BSON::ObjectId
   field :updated_by,  type: BSON::ObjectId
   
-  belongs_to  :dc_site #, optional: true
+  belongs_to  :dc_site, optional: true
   
   index( { dc_site: 1, position: 1 } )
   

data/app/models/dc_big_menu.rb

@@ -62,7 +62,7 @@ class DcBigMenu
   field :created_by,  type: BSON::ObjectId
   field :updated_by,  type: BSON::ObjectId
 
-  belongs_to  :dc_site #, optional: true
+  belongs_to  :dc_site, optional: true
 
   index( { dc_site_id: 1, parent: 1 } )
   index( { page_id: 1 } )

data/app/models/dc_filter.rb

@@ -132,7 +132,7 @@ def self.get_filter_field(parent)
 # url for filter ON action
   field['html']['data-url'] = parent.url_for(
     controller: 'cmsedit',action: :index, filter: 'on',
-    table: parent.form['table'], formname: parent.form['formname'])
+    table: parent.form['table'], form_name: parent.form['form_name'])
   url = field['html']['data-url']
 # create input field object
   klas_string = field['type'].camelize
@@ -165,7 +165,7 @@ def self.menu_filter(parent)
     filters = [filters] if filters.class == Hash
     filters.each do |filter| 
       url = parent.dc_link_to(filter['title'], nil,controller: :cmsedit, action: :index, table: table,
-                           formname: parent.params[:formname], 
+                           form_name: parent.params[:form_name], 
                            filter_field: filter['field'],
                            filter_oper: filter['operation'],
                            filter_value: filter['value'],

data/app/models/dc_link.rb

@@ -51,7 +51,7 @@ class DcLink
   field :created_by,  type: BSON::ObjectId
   field :updated_by,  type: BSON::ObjectId
 
-  belongs_to  :dc_site #, optional: true
+  belongs_to  :dc_site, optional: true
  
   index({ site_id: 1, name: 1 }, { unique: true })
   

data/app/models/dc_menu.rb

@@ -136,20 +136,20 @@ end
 # Will update link value of selected menu_item
 # 
 # Parameters: 
-# [path] String. String path to MenuItem document, separated by ;
-# [link] String. New value of the link field
+# [record] Array. Data of saved document.
 #######################################################################
-def self.update_menu_item_link(path, link)
-  return unless path and link
+def self.update_menu_item_link(record)
+  return unless record
 # 
-  ar = path.split(';')
+  ar = record.menu_id.split(';') 
   menu = find(ar.shift)
   while (item = ar.shift) do
     menu = menu.dc_menu_items.find(item)
   end
   return unless menu.respond_to?(:link) # top level selected
 #  
-  menu.link = link
+  menu.page_id = record.id if menu.respond_to?(:page_id)
+  menu.link    = record.subject_link if record.respond_to?(:subject_link)
   menu.save  
 end
 

data/app/models/dc_simple_menu.rb

@@ -58,7 +58,7 @@ class DcSimpleMenu
   index( { name: 1 }, { unique: true } )
 
   embeds_many :dc_simple_menu_items
-  belongs_to  :dc_site #, optional: true
+  belongs_to  :dc_site, optional: true
   
   validates_length_of :description, minimum: 10
   

data/app/models/dc_site.rb

@@ -48,6 +48,7 @@
 #  created_by           BSON::ObjectId       created_by
 #  updated_by           BSON::ObjectId       updated_by
 #  menu_name            String               Menu name for this site
+#  menu_id              BSON::ObjectId       Menu id. Menu name will be deprecated.
 #  settings             String               Various site settings
 #  alias_for            String               Is alias name for entered site name
 #  rails_view           String               Rails view filename used as standard design

data/app/models/drgcms_form_fields.rb

@@ -318,7 +318,7 @@ end
 # ===Form options:
 # * +name:+ field name (required)
 # * +type:+ embedded (required)
-# * +formname:+ name of form which will be used for editing
+# * +form_name:+ name of form which will be used for editing
 # * +html:+ html options (optional)
 #   * +height:+ height of embedded object in pixels (1000)
 #   * +width:+ width of embedded object in pixels (500)
@@ -327,7 +327,7 @@ end
 #    10:
 #      name: dc_parts
 #      type: embedded
-#      formname: dc_part
+#      form_name: dc_part
 #      html:
 #        height: 1000
 ###########################################################################
@@ -342,15 +342,15 @@ def render
   @yaml['html']['height'] ||= 300
   @yaml['html']['width']  ||= '99%'
 # defaults both way 
-  @yaml['table']    ||= @yaml['formname'] if @yaml['formname']
-  @yaml['formname'] ||= @yaml['table'] if @yaml['table']
+  @yaml['table']     ||= @yaml['form_name'] if @yaml['form_name']
+  @yaml['form_name'] ||= @yaml['table'] if @yaml['table']
 # 
   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, formname: @yaml['formname'], 
+  opts = { controller: 'cmsedit', action: 'index', ids: ids, table: tables, form_name: @yaml['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/app/views/cmsedit/_edit_stuff.html.erb

@@ -5,22 +5,8 @@
     <div class="cmsedit-table cmsedit-top">
       <div id="menu">
         
-  <% if false %>     
-        <%= link_to(image_tag('drg_cms/view_tile.png', class: 'dc-link-img', title: t('drgcms.menu_plus')), '#', 
-            onclick: "$('#cmsedit-menu-plus').toggleClass('div-hidden');")  %>
-  <% end %> 
-        
-  <% if false %>     
-        <ul><li>
-         <%= fa_icon('bars lg') %>
-         <ul>
-          <%= dc_choices4_cmsmenu.html_safe %>
-         </ul>
-        </li>
-        
-        </ul>
-  <% end %> 
-        
+        <%= link_to( fa_icon('user lg',class: "dc-animate", title: "#{t('drgcms.login')}"), '/cms/login' ) %>
+
         <% if @page %>
           <%= link_to( fa_icon('file-text-o lg', class: "dc-animate", title: "#{t('drgcms.edit_page')}"),
               {controller: 'cmsedit', action: 'edit', table: @site.page_table, id: @page._id}, target: 'iframe_cms') %>

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

@@ -2,21 +2,18 @@
   <%= render partial: 'edit_stuff' %>
 <% else %>
   <div id="dc-login">
-  <h2>CMS login</h2>
-  <%= dc_flash_messages %>   
-  <%= form_tag controller: 'dc_common', action: 'process_login', return_to: '/cmsedit/login?ok=1', method: :put do %>
-    <table>
-      <tr>
-        <td>Username:</td>
-        <td><%=  text_field('record', 'username') %>
-      </tr><tr>  
-        <td>Password:</td>
-        <td><%=  password_field('record', 'password') %>
-      </tr><tr>  
-        <td><%= submit_tag 'Login' %></td>
-      </tr>
-    </table>
-    <%= hidden_field_tag('return_to_error', request.url ) %>
-  <% end %>
+    <h2><%= t('drgcms.login') %></h2>
+    <%= dc_flash_messages %>   
+    <%= form_tag controller: 'dc_common', action: 'process_login', return_to: '/cmsedit/login?ok=1', method: :put do %>
+      <div class="label"><%= t('drgcms.username') %></div>
+      <div class="input"><%= text_field('record', 'username') %></div>
+
+      <div class="label"><%= t('drgcms.password') %></div>
+      <div class="input"><%= password_field('record', 'password') %></div>
+      
+      <div class="label"></div>
+      <div class="input"><%= submit_tag t('drgcms.login'), class: 'dc-animate-button' %></div>
+      <%= hidden_field_tag('return_to_error', request.url ) %>
+    <% end %>
   </div>
 <% end %>

data/config/locales/drgcms_en.yml

@@ -55,6 +55,9 @@ en:
     cms_main: CMS main tables
     cms_advanced: CMS advanced
     search_placeholder: Start typing to search
+    login: Login into CMS
+    username: User name
+    password: Password
 
     edit: Edit
     show: Prikaz

data/config/locales/drgcms_sl.yml

@@ -55,6 +55,10 @@ sl:
     cms_main: CMS tabele
     cms_advanced: CMS napredne opcije   
     search_placeholder: Vpišite pojem za iskanje
+    login: Prijava v CMS
+    username: Uporabnik
+    password: Geslo
+    
 
     edit: Urejanje
     show: Prikaz

data/config/locales/models_en.yml

@@ -288,7 +288,9 @@ en:
         if_border: Border
         if_params: Parameters
         if_id: CSS id
-        if_class: CSS class        
+        if_class: CSS class 
+        _update_menu: Update menu
+
 
       dc_part:
         tabletitle: Parts of page
@@ -721,7 +723,7 @@ en:
         if_params: Parameters added to URL address    
         if_id: CSS id of IFrame object
         if_class: CSS class of IFrame object
-        
+        _update_menu: Update link in selected menu to point to this document        
 
       dc_part:
         name: Parts can be searched by name or by id

data/config/locales/models_sl.yml

@@ -320,7 +320,8 @@ sl:
         if_border: Okvir
         if_params: Parametri
         if_id: CSS id
-        if_class: CSS class        
+        if_class: CSS class 
+        _update_menu: Spremeni meni
         
       dc_part:
         tabletitle: Elementi strani
@@ -752,6 +753,7 @@ sl:
         if_params: Pramateri posredovani v URL naslovu
         if_id: CSS id IFrame objekta
         if_class: CSS class IFrame objekta
+        _update_menu: Popravi tudi povezavo do dokumenta v menuju
 
       dc_part:
         name: Naziv elementa

data/drg_cms.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Damjan Rems"]
   s.email       = ["damjan.rems@gmail.com"]
   s.homepage    = "http://www.drgcms.org"
-  s.summary     = "DRG CMS: Rapid web application development tool for Ruby, Rails and MongoDB"
-  s.description = "DRG CMS can be used for rapid building of complex, data-entry intensive web sites as well as building your in-house private cloud applications."
+  s.summary     = "DRG: Rapid web application development tool and CMS for Ruby, Rails and MongoDB"
+  s.description = "DRG, development tool for rapid building of in-house (Intranet, private cloud) applications as well as CMS for creating complex, data-entry intensive web sites."
   s.license     = "MIT"
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md", "History.log", "drg_cms.gemspec"]
   s.test_files = Dir["test/**/*"]

data/lib/drg_cms.rb

@@ -111,6 +111,13 @@ def self.paths(key)
   @@paths[key]
 end
 
+###############################################################################
+# Will return name of file relative to drg_cms gem root
+###############################################################################
+def self.from_root(file=nil)
+  File.expand_path("../../#{file}", __FILE__).to_s
+end
+
 ###############################################################################
 # All Routes required by DrgCms. 
 # 

data/lib/drg_cms/version.rb

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

data/test/fixtures/drg_cms_test_data.rb

@@ -0,0 +1,87 @@
+##################################################################
+# Fill database with test data
+##################################################################
+def drg_cms_test_data_fill
+  # Roles
+  sa_role    = DcPolicyRole.create!(name: 'superadmin', system_name: 'superadmin')
+  guest_role = DcPolicyRole.create!(name: 'guest', system_name: 'guest')
+  admin_role = DcPolicyRole.create!(name: 'Administrators', system_name: 'admin')
+
+  # collection Permissions
+  default_permission = DcPermission.create!(table_name: 'Default permission',is_default: true)
+  rule1 = DcPolicyRule.new(dc_policy_role: sa_role, permission: 128)
+  rule2 = DcPolicyRule.new(dc_policy_role: guest_role, permission: 0)
+  rule3 = DcPolicyRule.new(dc_policy_role: admin_role, permission: 64)
+  default_permission.dc_policy_rules << rule1
+  default_permission.dc_policy_rules << rule2
+  default_permission.dc_policy_rules << rule3
+  # dc_memory
+  dc_memory_permission = DcPermission.create!(table_name: 'dc_memory')
+  rule1 = DcPolicyRule.new(dc_policy_role: guest_role, permission: 8)
+  dc_memory_permission.dc_policy_rules << rule1
+
+  # SITE
+  site = DcSite.create!(
+    name: 'www.mysite.com',
+    homepage_link: "home",
+    menu_class: "DcSimpleMenu",
+    menu_name: "site-menu",
+    page_class: "DcPage",
+    page_table: "dc_page",
+    files_directory: "files",
+    settings: "ckeditor:
+      config_file: /files/ck_config.js
+      css_file: /files/ck_css.css",
+    site_layout: "content")
+
+  default_policy = DcPolicy.new(
+    description: 'Default policy',
+    is_default: true,
+    message: 'Access denied.',
+    name: 'Default policy')
+  site.dc_policies << default_policy
+
+  rule2 = DcPolicyRule.new(dc_policy_role: admin_role, permission: 2)
+  rule3 = DcPolicyRule.new(dc_policy_role: guest_role, permission: 1)
+  default_policy.dc_policy_rules << rule2
+  default_policy.dc_policy_rules << rule3
+
+  site.save
+
+  # TEST site
+  testsite = DcSite.create!(name: 'test', alias_for: "www.mysite.com")
+
+  # Users
+  rems = DcUser.new(
+    username: 'admin',
+    name: 'Admin User',
+    password_digest: '$2a$10$ifVfdEeCCetvUDl1n2JgCuTPdyyLyl6tXjEX5YlKJjzWErN4lzBkC')
+  rems.save
+  role1 = DcUserRole.new(dc_policy_role: admin_role, active: true)
+  rems.dc_user_roles << role1
+
+  guest = DcUser.new(
+    username: 'guest',
+    name: 'Guest User',
+    password_digest: '$2a$10$ifVfdEeCCetvUDl1n2JgCuTPdyyLyl6tXjEX5YlKJjzWErN4lzBkC')
+  guest.save
+end
+
+##################################################################
+# Delete test data
+##################################################################
+def drg_cms_test_data_delete
+  DcUser.all.delete
+  DcSite.all.delete
+  DcPermission.all.delete
+  DcPolicyRole.all.delete
+end
+
+##################################################################
+# Load test data
+##################################################################
+def drg_cms_test_data_load
+  p 'load'
+  drg_cms_test_data_delete
+  drg_cms_test_data_fill
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.52.2
+  version: 0.5.52.3
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-07 00:00:00.000000000 Z
+date: 2018-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,8 +150,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: DRG CMS can be used for rapid building of complex, data-entry intensive
-  web sites as well as building your in-house private cloud applications.
+description: DRG, development tool for rapid building of in-house (Intranet, private
+  cloud) applications as well as CMS for creating complex, data-entry intensive web
+  sites.
 email:
 - damjan.rems@gmail.com
 executables: []
@@ -372,9 +373,9 @@ files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
+- test/fixtures/drg_cms_test_data.rb
 - test/integration/navigation_test.rb
 - test/lib/generators/new_drg_form_generator_test.rb
-- test/test_helper.rb
 homepage: http://www.drgcms.org
 licenses:
 - MIT
@@ -395,15 +396,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
-summary: 'DRG CMS: Rapid web application development tool for Ruby, Rails and MongoDB'
+summary: 'DRG: Rapid web application development tool and CMS for Ruby, Rails and
+  MongoDB'
 test_files:
-- test/test_helper.rb
 - test/lib/generators/new_drg_form_generator_test.rb
 - test/drg_cms_test.rb
 - test/integration/navigation_test.rb
+- test/fixtures/drg_cms_test_data.rb
 - test/dummy/README.rdoc
 - test/dummy/config/locales/en.yml
 - test/dummy/config/initializers/secret_token.rb

data/test/test_helper.rb

@@ -1,17 +0,0 @@
-# Copyright 2012-2016 Damjan Rems
-# Configure Rails Environment
-
-ENV["RAILS_ENV"] = "test"
-
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-require "rails/test_help"
-
-Rails.backtrace_cleaner.remove_silencers!
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-# Load fixtures from the engine
-if ActiveSupport::TestCase.method_defined?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-end