drg_cms 0.6.1.11 → 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
 
 ####################################################################

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/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_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/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_edit_helper.rb

@@ -137,7 +137,7 @@ def dc_actions_for_form(position)
   actions.delete('standard')
   actions = actions.to_a.sort { |x, y| x[0] <=> y[0] }
   # Add spinner to the beginning
-  html = %Q[<span class="dc-spinner">#{fa_icon('settings-o spin')}</span><ul class="dc-menu #{position}">]
+  html = %(<span class="dc-spinner">#{mi_icon('settings-o spin')}</span><ul class="dc-menu #{position}">)
 
   actions.each do |key, options|
     session[:form_processing] = "form:actions: #{key} #{options}"
@@ -211,7 +211,7 @@ def dc_actions_for_form(position)
              dc_submit_tag(caption, icon, { data: parameters, title: options['title'] }) +
           '</li>'
         else
-          %(<li><div class="dc-link-no">#{fa_icon(icon)} #{caption}</div></li>)
+          %(<li><div class="dc-link-no">#{mi_icon(icon)} #{caption}</div></li>)
         end
       
       # delete with some sugar added

data/app/helpers/dc_application_helper.rb

@@ -314,50 +314,22 @@ def dc_new_title
   end
 end
 
-####################################################################
-# Formats label and html input code for display on edit form.
-#  
-#  Parameters:
-#  [input_html] String. HTML code for data input field.
-#  [label] String. Input field label.
-####################################################################
-def dc_label_for(input_html, label)
-  c =<<eot
-<tr>
-  <td class="dc-edit-label">#{label}</td>
-  <td class="dc-edit-field">#{input_html}</td>
-</tr>
-eot
-  c.html_safe
-end
-
 ############################################################################
 # Similar to rails submit_tag, but also takes care of link icon, translation, ...
 ############################################################################
-def dc_submit_tag(caption, icon, parms, rest={})
-  parms['class'] ||= 'dc-link'
-  if icon
-    icon_image = if icon.match(/\./)
-      image_tag(icon)
-    elsif icon.match('<i')
-      icon
-    else
-      fa_icon(icon)
-    end
-  end
-  html = icon_image || ''
-  #html << submit_tag(t(caption, caption), parms)
-  %Q[<button type="submit" class="dc-submit" name="commit" value="#{t(caption, caption)}">#{icon_image} #{t(caption, caption)}</button>].html_safe
+def dc_submit_tag(caption, icon, parms, rest = {})
+  icon_image = dc_icon_for_link(icon, nil)
+  %(<button type="submit" class="dc-submit" name="commit" value="#{t(caption, caption)}">#{icon_image} #{t(caption, caption)}</button>).html_safe
 end
 
 ############################################################################
 # Returns icon code if icon is specified
 ############################################################################
-def dc_icon_for_link(icon)
+def dc_icon_for_link(icon, clas = 'dc-link-img')
   return '' if icon.blank?
 
   if icon.match(/\./)
-    _origin.image_tag(icon, class: 'dc-link-img')
+    _origin.image_tag(icon, class: clas)
   elsif icon.match('<i')
     icon
   else
@@ -619,7 +591,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-o' )
-    opts[:editparams].merge!( :id => page.id, :t => _origin.site.page_class.underscore, f: opts[:form_name], edit_only: 'body' )
+    opts[:editparams].merge!( :id => page.id, :table => _origin.site.page_class.underscore, form_name: opts[:form_name], edit_only: 'body' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_content') )
     
     opts[:editparams].merge!( edit_only: nil, 'icon' => 'edit-o' )
@@ -867,7 +839,7 @@ end
 # 
 # Parameters:
 # [ctrl] Controller object or object which holds methods to access session object. For example @parent
-# variable when called from renderer.
+# when called from renderer.
 # [policy_id] Document or documents policy_id field value required to view data. Method will automatically 
 # check if parameter send has policy_id field defined and use value of that field.
 # 
@@ -882,9 +854,11 @@ end
 # False and message from policy that is blocking view if access is not allowed.
 ############################################################################
 def dc_user_can_view(ctrl, policy_id)
-  policy_id = policy_id.policy_id if policy_id and policy_id.respond_to?(:policy_id)
+  @can_view_cache ||= {}
+  policy_id = policy_id.policy_id if policy_id&.respond_to?(:policy_id)
   # Eventualy object without policy_id will be checked. This is to prevent error
   policy_id = nil unless policy_id.class == BSON::ObjectId
+  return @can_view_cache[policy_id] if @can_view_cache[policy_id]
 
   site = ctrl.site
   policies = if site.inherit_policy.blank? 
@@ -894,7 +868,7 @@ def dc_user_can_view(ctrl, policy_id)
   end
   # permission defined by default policy
   default_policy = Mongoid::QueryCache.cache { policies.find_by(is_default: true) }
-  return false, 'Default access policy not found for the site!' unless default_policy
+  return cache_add(policy_id, false, 'Default access policy not found for the site!') unless default_policy
 
   permissions = {}
   default_policy.dc_policy_rules.to_a.each { |v| permissions[v.dc_policy_role_id] = v.permission }
@@ -902,28 +876,29 @@ def dc_user_can_view(ctrl, policy_id)
   part_policy = nil
   if policy_id
     part_policy = Mongoid::QueryCache.cache { policies.find(policy_id) }
-    return false, 'Access policy not found for part!' unless part_policy
+    return cache_add(policy_id, false, 'Access policy not found for part!') unless part_policy
+
     part_policy.dc_policy_rules.to_a.each { |v| permissions[v.dc_policy_role_id] = v.permission }
   end
   # apply guest role if no roles defined
   if ctrl.session[:user_roles].nil?
     role = Mongoid::QueryCache.cache { DcPolicyRole.find_by(system_name: 'guest', active: true) }
-    return false, 'System guest role not defined!' unless role
+    return cache_add(policy_id, false, 'System guest role not defined!') unless role
+
     ctrl.session[:user_roles] = [role.id]
   end
   # Check if user has any role that allows him to view part
-  can_view, msg = false,''
-  ctrl.session[:user_roles].each do |role|
-    next unless permissions[role]          # role not yet defined. Will die in next line.
-    if permissions[role] > 0
-      can_view = true
-      break
-    end
+  can_view = ctrl.session[:user_roles].reduce(false) do |result, role|
+    break true if permissions[role] && permissions[role] > 0
   end
-  msg = if !can_view
-    part_policy ? t(part_policy.message,part_policy.message) : t(default_policy.message,default_policy.message)
+
+  msg = ''
+  unless can_view
+    msg = part_policy ? t(part_policy.message, part_policy.message) : t(default_policy.message, default_policy.message)
+    # message may have variable content
+    msg = _origin.render(inline: msg, layout: nil) if msg.match('<%=')
   end
-  return can_view, msg
+  cache_add(policy_id, can_view, msg)
 end
 
 ####################################################################
@@ -1234,5 +1209,12 @@ def dc_img_alt(file_name, text=nil)
   name[0,name.index('.')].downcase rescue name
 end
 
+private
+
+# will cache dc_user_can_view response
+def cache_add(id, can_view, msg)
+  @can_view_cache[id] = [can_view, msg]
+end
+
 
 end

data/app/helpers/dc_category_helper.rb

@@ -0,0 +1,129 @@
+#--
+# Copyright (c) 2012+ 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.
+#++
+
+
+####################################################################
+# Helper for editing categories as tree view.
+####################################################################
+module DcCategoryHelper
+
+####################################################################
+#
+####################################################################
+def categories_as_tree
+  html = '<div id="catagories-as-tree"><ul><li data-id="nil"><span class="mi-o mi-home"></span>'
+  data = DcCategory.where(parent: nil).order_by(order: 1).to_a
+  html_for_category_tree(html, data)
+  (html << '</li></ul></div>' << js_for_category_tree).html_safe
+end
+
+private
+
+####################################################################
+#
+####################################################################
+def html_for_category_tree(html, data)
+  html << '<ul>'
+  data.each do |category|
+    icon = category.active ? 'check_box' : 'check_box_outline_blank'
+    html << %(<li id="#{category.id}" data-parent="#{category.parent}"><span class="mi-o mi-#{icon} mi-18"></span>#{category.name}\n)
+    children = DcCategory.where(parent: category.id).order_by(order: 1).to_a
+
+    html_for_category_tree(html, children) if children.size > 0
+    html << '</li>'
+  end
+  html << '</ul>'
+end
+
+####################################################################
+#
+####################################################################
+def js_for_category_tree
+  %(<script>
+$(function() {
+  $("#catagories-as-tree").jstree( {
+    core: { themes: { icons: false },
+            multiple: false
+          },
+    plugins: ["types", "contextmenu"],
+    contextmenu: {
+        items: function ($node) {
+            return {
+                edit: {
+                    label: "<span class='dc-result-submenu'>#{t('drgcms.edit')}</span>",
+                    icon: "mi-o mi-edit",
+                    action: function (obj) {
+                        let id = $('#catagories-as-tree').jstree('get_selected', true)[0].id;
+                        let params = "&ids=" + id;
+                        location.href = "/cmsedit/" + id + "/edit?t=dc_category&f=dc_category_as_tree" + params;
+                    }
+                },
+
+                new_child: {
+                    label: "<span class='dc-result-submenu'>#{t('drgcms.new')}</span>",
+                    icon: "mi-o mi-plus",
+                    action: function (obj) {
+                        let id = $('#catagories-as-tree').jstree('get_selected', true)[0].id;
+                        let params = "&ids=" + id + "&p_parent=" + id;
+                        location.href = "/cmsedit/new?t=dc_category&f=dc_category_as_tree" + params
+                    }
+                },
+
+                delete: {
+                    label: "<span class='dc-result-submenu'>#{t('drgcms.delete')}</span>",
+                    icon: "mi-o mi-delete",
+                    action: function (obj) {
+                        if (confirmation_is_cancled("#{t('drgcms.confirm_delete')}") === true) return false;
+
+                        let id = $('#catagories-as-tree').jstree('get_selected', true)[0].id;
+                        let id_return = $('#catagories-as-tree').jstree('get_selected', true)[0].data["parent"];
+
+                        $.ajax({
+                            url: "/cmsedit/" + id + "?t=dc_category",
+                            type: 'DELETE',
+                            success: function(data) {
+                              let error = data.match("#{I18n.t('drgcms.category_has_subs')}");
+                              if (error !== null) {
+                                alert(error[0]);
+                                params = "?t=dc_category&f=dc_category_as_tree&ids=" + id;
+                                location.href = "/cmsedit" + params;
+                                return true;
+                              }
+                            }
+                        });
+
+                        let params = "?t=dc_category&f=dc_category_as_tree&ids=" + id_return;
+                        location.href = "/cmsedit" + params;
+                    }
+                },
+            }
+          },
+       },
+    });
+    $("#catagories-as-tree").jstree(true).select_node("#{params[:ids]}");
+});
+
+</script>)
+end
+
+end

data/app/models/dc_category.rb

@@ -42,32 +42,60 @@
 # is most useful for grouping news, blog entries ...
 #####################################################################
 class DcCategory
-  include Mongoid::Document
-  include Mongoid::Timestamps
+include Mongoid::Document
+include Mongoid::Timestamps
 
-  field   :name,        type: String
-  field   :description, type: String
-  field   :ctype,       type: Integer, default: 1 
-  field   :parent,      type: BSON::ObjectId
-  field   :active,      type: Boolean, default: true
-  field   :order,       type: Integer, default: 0
-  field   :created_by,  type: BSON::ObjectId
-  field   :updated_by,  type: BSON::ObjectId
-  field   :dc_site_id,  type: BSON::ObjectId
+field   :name,        type: String
+field   :description, type: String
+field   :ctype,       type: Integer, default: 1
+field   :parent,      type: BSON::ObjectId
+field   :active,      type: Boolean, default: true
+field   :order,       type: Integer, default: 0
+field   :created_by,  type: BSON::ObjectId
+field   :updated_by,  type: BSON::ObjectId
+field   :dc_site_id,  type: BSON::ObjectId
 
-  validates :name, :presence => true
-  
-  index  name: 1
-  index  ctype: 1
-  index  site_id: 1
+index  name: 1
+index  ctype: 1
+index  site_id: 1
+
+validates :name, presence: true
+
+before_destroy :can_destroy?
+
+private
+
+#########################################################################
+# Can't delete if category document has children documents
+#########################################################################
+def can_destroy?
+  if DcCategory.where(parent: id).count > 0
+    errors.add(:base, I18n.t('drgcms.category_has_subs'))
+    throw :abort
+  end
+end
   
 #########################################################################
-# Returns all values vhich can be used as parent select field.
+# Returns all values for use as parent select field.
 #########################################################################
-def self.values_for_parent(site_id=nil) #:nodoc:
+def self.values_for_parent(site_id = nil) #:nodoc:
   qry = where(active: true)
   qry = qry.and(dc_site_id: site_id.id) if site_id
-  qry.sort(name: 1).inject([]) {|r,v| r << [v.name, v._id]} 
+  parents = {} # cache parent names to minimize database usage
+  qry.inject([]) do |r, v|
+    if parents[v.parent].nil?
+       name   = ''
+       parent = v.parent
+       until parent.nil?
+         doc    = find(parent)
+         name   = doc.name + ' / ' + name
+         parent = doc.parent
+       end
+       parents[v.parent] = name
+    end
+    name = v.parent ? parents[v.parent] + v.name : v.name
+    r << [name, v._id]
+  end.sort { |a, b| a.first <=> b.first }
 end
 
 #########################################################################
@@ -80,8 +108,8 @@ def self.choices4_ctype(site_id=nil)
     DcBigTable.choices4('dc_category_type', site_id)
   else
     opts = I18n.t('helpers.label.dc_category.choices4_ctype')
-# not defined    
-    return [] if opts.blank?
+    return [] if opts.blank? # not defined
+
     opts.split(',').inject([]) {|result, e| result << e.split(':')}    
   end
 end
@@ -89,13 +117,11 @@ end
 #########################################################################
 # Returns choices for all categories, prepared for tree_select input field
 #########################################################################
-def self.choices4_categories(site_id=nil)
+def self.choices4_categories(site_id = nil)
   qry = where(active: true)
-# 
   ar = [nil]
   ar << site_id.id if site_id
   qry = qry.in(dc_site_id: ar)
-#
   qry.inject([]) { |result, category| result << [category.name, category.id, category.parent, category.order] }
 end
 

data/app/models/drgcms_form_fields/date_picker.rb

@@ -66,30 +66,28 @@ class DatePicker < DrgcmsField
 ###########################################################################
 def render
   value = @record.try(@yaml['name']) ? I18n.localize(@record[@yaml['name']].to_date) : nil
-  #return ro_standard( @parent.dc_format_value(value)) if @readonly
-
-  @yaml['options'] ||= {}
   set_initial_value
   @yaml['html']['size'] ||= @yaml['size'] || 10
   @yaml['html']['value'] ||= value
   @yaml['html']['autocomplete'] ||= 'off'
   @yaml['html']['class'] = @yaml['html']['class'].to_s + ' date-picker'
 
-  @yaml['options']['lang']   ||= "'#{I18n.locale}'"
-  @yaml['options']['format'] ||= "'#{t('datetimepicker.formats.date')}'"
-  @yaml['options']['timepicker'] = false
-  @yaml['options']['scrollMonth'] ||= false
-  @yaml['options']['scrollInput'] ||= false
+  options = options_to_hash(@yaml['options'])
+  options['lang']   ||= I18n.locale.to_s
+  options['format'] ||= t('datetimepicker.formats.date')
+  options['timepicker'] = false
+  options['scrollMonth'] ||= false
+  options['scrollInput'] ||= false
 
   record = record_text_for(@yaml['name'])
   @html << @parent.text_field(record, @yaml['name'], @yaml['html'])
-  @js << %Q[
+  @js << %(
 $(document).ready(function() {
-  $("##{record}_#{@yaml['name']}").datetimepicker( {
-    #{hash_to_options(@yaml['options'])}
+  $("##{record}_#{@yaml['name']}").datetimepicker({
+    #{hash_to_options(options)}
   });
 });
-] unless @readonly
+) unless @readonly
   
   self
 end