drg_cms 0.6.1.9 → 0.7.0.2

data/app/controllers/dc_common_controller.rb

@@ -116,7 +116,7 @@ def toggle_edit_mode
   end
   url << (url.match(/\?/) ? '&' : '?')
   url << "return_to_ypos=#{ypos}"
-  redirect_to url
+  redirect_to(url, allow_other_host: true)
 end
 
 ####################################################################
@@ -128,15 +128,15 @@ def process_login
 
   unless params[:record][:password].blank? #password must not be empty
     user  = DcUser.find_by(username: params[:record][:username], active: true)
-    if user and user.authenticate(params[:record][:password])
+    if user && user.authenticate(params[:record][:password])
       fill_login_data(user, params[:record][:remember_me].to_i == 1)
-      return redirect_to params[:return_to] ||  '/'
+      return redirect_to(params[:return_to] ||  '/', allow_other_host: true)
     else
       clear_login_data # on the safe side
     end
   end
   flash[:error] = t('drgcms.invalid_username')
-  redirect_to params[:return_to_error] ||  '/'
+  redirect_to(params[:return_to] ||  '/', allow_other_host: true)
 end
 
 ####################################################################
@@ -144,7 +144,7 @@ end
 ####################################################################
 def logout
   clear_login_data
-  redirect_to params[:return_to] || '/'
+  redirect_to(params[:return_to] || '/', allow_other_host: true)
 end
 
 ####################################################################
@@ -156,14 +156,14 @@ def login
     user = DcUser.find(cookies.signed[:remember_me])
     if user and user.active
       fill_login_data(user, true)
-      return redirect_to params[:return_to]
+      return(redirect_to params[:return_to], allow_other_host: true)
     else
       clear_login_data # on the safe side
     end
   end
   # Display login
   route = params[:route] || 'poll'
-  redirect_to "/#{route}?poll_id=login&return_to=#{params[:return_to]}"
+  redirect_to("/#{route}?poll_id=login&return_to=#{params[:return_to]}", allow_other_host: true)
 end
 
 ####################################################################
@@ -268,7 +268,7 @@ end
 ########################################################################
 def add_json_ld_schema
   edited_document = DcJsonLd.find_document_by_ids(CmsHelper.table_param(params), params[:ids])
-  yaml = YAML.load_file( dc_find_form_file('json_ld_schema') )
+  yaml = YAML.load_file( CmsHelper.form_file_find('json_ld_schema') )
   schema_data = yaml[params[:schema]]
   # Existing document
   if edited_document.dc_json_lds.find_by(type: "@#{params[:schema]}")
@@ -283,12 +283,10 @@ end
 # Will provide help data
 ########################################################################
 def help
+  dc_form_read
   form_name = CmsHelper.form_param(params) || CmsHelper.table_param(params)
-  @form = form_name ? YAML.load_file(dc_find_form_file(form_name)) : {}
-  return render json: {} if @form.nil?
-
   help_file_name = @form['help'] || @form['extend'] || form_name
-  help_file_name = find_help_file(help_file_name)
+  help_file_name = DcApplicationController.find_help_file(help_file_name)
   @help = YAML.load_file(help_file_name) if help_file_name
   # no auto generated help on index action
   return render json: {} if params[:type] == 'index' && @help.nil?
@@ -298,18 +296,6 @@ end
 
 protected
 
-########################################################################
-# Will search for help file and return it's path if found
-########################################################################
-def find_help_file(help_file_name)
-  file_name = nil
-  DrgCms.paths(:forms).reverse.each do |path|
-    f = "#{path}/help/#{help_file_name}.#{I18n.locale}"
-    file_name = f and break if File.exist?(f)
-  end
-  file_name
-end
-
 ########################################################################
 # Subroutine of add_json_ld_schema for adding one element
 ########################################################################

data/app/controls/browse_models_control.rb

@@ -49,6 +49,8 @@ end
 def collections
   @records = []
   all_collections.each do |collection|
+    next if params[:filter] && !collection.match(/#{params[:filter]}/i)
+
     @records << DcMemory.new({'id' =>  collection, 'description' => t("helpers.label.#{collection}.tabletitle") })
   end
   @records
@@ -75,7 +77,7 @@ def all_fields
                  '_default' => options[:default]
                 })
   end
-# embedded documents
+  # embedded documents
   document.embedded_relations.each do |a_embedded|
     embedded = a_embedded.last
     description = I18n.t("helpers.help.#{params[:id]}.#{embedded.key}")

data/app/controls/cmsedit_control.rb

@@ -43,11 +43,15 @@ end
 ######################################################################
 def filter_on
   table_name = CmsHelper.table_param(params).strip.split(';').first.underscore
+  session[table_name] ||= {}
   session[table_name][:page] = 1
   set_session_filter(table_name)
   url = url_for( controller: 'cmsedit', t: table_name, f: CmsHelper.form_param(params))
 
-  render json: { url: url }
+  respond_to do |format|
+    format.json { render json: { url: url } }
+    format.html { redirect_to url }
+  end
 end
 
 ########################################################################

data/app/controls/dc_category_control.rb

@@ -0,0 +1,61 @@
+#--
+# Copyright (c) 2014+ Damjan Rems
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+######################################################################
+# DrgcmsControls for DcPage model.
+######################################################################
+module DcCategoryControl
+
+######################################################################
+# Called when new empty record is created
+######################################################################
+def dc_new_record
+  if params[:selected]
+
+  end
+  if params[:from_menu]
+    # find menu and submenu. Menu class is defined in Site.
+    menu_a = params[:id].split(';')
+    menu   = dc_get_site.menu_klass.find(menu_a.shift)
+    menu_items_method = "#{dc_get_site.menu_class}_items".underscore
+    menu_i = menu.send(menu_items_method).find(menu_a.shift)
+    while menu_a.size > 0 do menu_i = menu_i.send(menu_items_method).find(menu_a.shift) end
+    # Fill values for form
+    @record.subject = menu_i.caption    
+    @record.dc_site_id = menu.dc_site_id
+    @record.menu_id = params[:id]
+    # set update_menu on save parameter
+    params['p__update_menu'] = '1'
+  else
+    @record.design_id = params[:design_id] if params[:design_id]
+    return unless params[:page_id]
+    # inherit some values from currently active page
+    if page = DcPage.find(params[:page_id])
+      @record.design_id  = page.design_id
+      @record.menu       = page.menu
+      @record.dc_site_id = page.dc_site_id
+    end
+  end
+end
+
+end

data/app/controls/dc_report.rb

@@ -132,7 +132,7 @@ end
 # Export data to Excel
 ######################################################################
 def export_to_excel(report_id)
-  read_drg_form if @form.blank?
+  dc_form_read if @form.blank?
   # use report options if present
   columns = (@form['report'] ? @form['report'] : @form)['result_set']['columns'].sort
 

data/app/forms/all_options.yml

@@ -156,6 +156,8 @@ form:
       or
       active:
         method: SomeClass.is_active_method
+      html:
+        data-validate: no
 
     5: 
       type: window

data/app/forms/cms_menu.yml

@@ -62,12 +62,13 @@ menu:
         controller: cmsedit
         icon: more_horiz-o
         table: dc_simple_menu
-      90: 
+      90:
         caption: helpers.label.dc_category.tabletitle
         controller: cmsedit
         icon: list
         table: dc_category
-      100: 
+
+      100:
         caption: helpers.label.dc_poll.tabletitle
         controller: cmsedit
         icon: poll-o

data/app/forms/dc_browse_models.yml

@@ -6,6 +6,16 @@ controls: browse_models
 permissions:
   can_view: admin
 
+index:
+  actions:
+    10:
+      type: field
+      name: filter
+      field_type: text_field
+      caption: Filter
+      size: 10
+
+
 result_set:
   filter: collections
 
@@ -19,8 +29,20 @@ result_set:
     10:   
       name: id
       caption: Collection
-      td_style: 'font-weight: bold;width: 150px;'
-      
+      td_style: 'font-weight: bold;'
+
     20:  
       name: description
       caption: Decription
+
+script: '
+$(document).ready( function() {
+  $("#record_filter").keydown( function(e) {
+    if (e.which == "13" || e.which == "9") {
+      let url = "/cmsedit?form_name=dc_browse_models&table=dc_memory&filter=" + this.value;
+      window.location.href = url;
+      e.preventDefault();
+    };
+  });
+});
+'

data/app/forms/dc_category.yml

@@ -3,8 +3,17 @@
 table: dc_category
 
 index:
-  filter: name, description, ctype, parent
-  actions: standard
+  filter: name, description, dc_site_id, parent
+  actions:
+    1: new
+    2: filter
+    10:
+      type: link
+      icon: account_tree-o
+      caption: drgcms.category_as_tree
+      table: dc_category
+      form_name: dc_category_as_tree
+#        controller: cmsedit
 
 result_set:
   actions: 
@@ -36,13 +45,11 @@ form:
     10:
       name: name
       type: text_field
-      html:
-        size: 30
+      size: 30
     20:
       name: description
       type: text_field
-      html:
-        size: 100
+      size: 100
     30:
       name: ctype
       type: select
@@ -51,8 +58,7 @@ form:
     40:
       name: order
       type: text_field
-      html:
-        size: 5
+      size: 5
     50:
       name: dc_site_id
       type: select
@@ -65,4 +71,7 @@ form:
       eval: DcCategory.values_for_parent
       html:
         include_blank: true
+    70:
+      name: active
+      type: check_box
 

data/app/forms/dc_category_as_tree.yml

@@ -0,0 +1,31 @@
+## YAML Template for page
+---
+extend: dc_category
+
+index:
+  actions:
+    10: /
+
+result_set:
+  type: method
+  eval: categories_as_tree
+
+form:
+  actions:
+    standard: /
+    1:
+      type: link
+      caption: drgcms.back
+      icon: arrow-back
+      form_name: dc_category_as_tree
+      table: dc_category
+      params:
+        ids:
+          object: params
+          method: ids
+
+    10:
+      type: submit
+      caption: 'drgcms.save&back'
+      form_name: dc_category_as_tree
+      table: dc_category

data/app/forms/dc_steps_template.yml

@@ -0,0 +1,51 @@
+## Template for standard options on wizard form
+form:
+  css: '#dc-form-left {display: block;width: 20%}'
+  actions:
+    1:
+      type: ajax
+      caption: drgcms.cancel
+      icon: cancel
+      method: post
+      form_name: x
+      action: run
+      control: x.steps_cancel
+      params:
+        step: x
+        next_step: x
+
+    10:
+      type: ajax
+      caption: drgcms.back
+      icon: arrow-back
+      method: post
+      form_name: x
+      action: run
+      control: x.steps
+      params:
+        step: x
+        next_step: x
+
+    20:
+      type: ajax
+      caption: drgcms.next
+      icon: arrow-forward
+      method: post
+      form_name: x
+      action: run
+      control: x.steps
+      params:
+        step: x
+        next_step: x
+
+    100:
+      type: ajax
+      caption: drgcms.finish
+      icon: done
+      method: post
+      form_name: x
+      action: run
+      control: x.steps_finish
+      params:
+        step: x
+        next_step: x

data/app/forms/help/dc_category_as_tree.en

@@ -0,0 +1,4 @@
+---
+index: "<p>Updates categories in a Tree view. For edit menu click right mouse button
+  over selected category.</p>\r\n"
+form: ''

data/app/forms/help/dc_category_as_tree.sl

@@ -0,0 +1,5 @@
+---
+index: "<p>Urejanje kategorij v drevesnem pogledu. Poi&scaron;čite va&scaron;o kategorijo
+  in kliknite desni gumb na mi&scaron;ki za menu.</p>\r\n"
+form: "<p>Urejanje kategorij v drevesnem pogledu. Poi&scaron;čite va&scaron;o kategorijo
+  in kliknite desni gumb na mi&scaron;ki za menu.</p>\r\n"

data/app/helpers/cms_common_helper.rb

@@ -81,12 +81,26 @@ end
 # Translation is provided by lang.helpers.label.table_name.field_name locale. If
 # translation is not found method will capitalize field_name and replace '_' with ' '.
 ############################################################################
-def t_name(field_name, default='')
+def t_label_for_field(field_name, default='')
   c = t("helpers.label.#{@form['table']}.#{field_name}", default)
   c = field_name.capitalize.gsub('_',' ') if c.match( 'translation missing' )
   c
 end
 
+############################################################################
+# Returns label for field translated to current locale for usage browser header.
+# Translation is provided by lang.helpers.label.table_name.field_name locale. If
+# not found method will look in standard drgcms translations.
+#
+############################################################################
+def t_label_for_column(options)
+  label = options['caption'] || options['label']
+  label = (options['name'] ? "helpers.label.#{@form['table']}.#{options['name']}" : '') if label.nil?
+  label = t(label) if label.match(/\./)
+  label = t("drgcms.#{options['name']}") if label.match('helpers.') # standard field names like created_by, updated_at
+  label
+end
+
 ###########################################################################
 # When select field is used on form options for select can be provided by 
 # helpers.label.table_name.choices4_name locale. This is how select
@@ -374,4 +388,55 @@ def dc_help_body
   (params[:type] == 'index' ? @help['index'] : @help['form']).html_safe
 end
 
+############################################################################
+# Will return code for help button if there is any help text available for the form.
+############################################################################
+def dc_help_button(result_set)
+  type = result_set.nil? ? 'form' : 'index'
+  form_name = CmsHelper.form_param(params) || CmsHelper.table_param(params)
+  url = url_for(controller: :dc_common, action: :help, type: type, f: form_name)
+  html = %(<div class="dc-help-icon dc-link-ajax" data-url=#{url}>#{fa_icon('question-circle')}</div>)
+  return html if type == 'form'
+
+  # check if index has any help available
+  help_file_name = @form['help'] || @form['extend'] || form_name
+  help_file_name = DcApplicationController.find_help_file(help_file_name)
+  if help_file_name
+    help = YAML.load_file(help_file_name)
+    return html if help['index']
+  end
+  ''
+end
+
+############################################################################
+# Will return html code for steps menu when form with steps is processed.
+############################################################################
+def dc_steps_menu_get(parent)
+  yaml = @form['form']['steps']
+  return '' unless yaml
+
+  html = %(<ul id="dc-steps-menu"><h2>#{t('drgcms.steps')}</h2>)
+  control = @form['control'] ? @form['control'] : @form['table']
+  parms = { controller: 'cmsedit', action: 'run', control: "#{control}.steps",
+            table: CmsHelper.table_param(params),
+            form_name: CmsHelper.form_param(params),
+            id: @record.id }
+
+  yaml.sort.each_with_index do |data, i|
+    n = i + 1
+    step = data.last # it's an array
+    url = case params[:step].to_i
+          when n + 1 then url_for(parms.merge({ step: n + 1, next_step: n}))
+          when n then url_for(parms.merge({ step: n, next_step: n}))
+          when n - 1 then url_for(parms.merge({ step: n - 1, next_step: n}))
+          else
+            ''
+          end
+    _class = url.present? ? 'dc-link-ajax' : ''
+    _class << (params[:step].to_i == n ? ' active' : '')
+    html << %(<li class="#{_class}" data-url="#{url}">#{step['title']}</li>)
+  end
+  html << '</ul>'
+end
+
 end