drg_cms 0.6.0.3 → 0.6.0.6

data/app/controllers/dc_application_controller.rb

@@ -128,8 +128,7 @@ def dc_find_form_file(form_file)
     f = "#{path}/#{form_file}.yml"
     return f if File.exist?(f) and (form_path.nil? or path.to_s.match(/\/#{form_path}\//i))
   end
-  logger.error "Form file #{form_file} not found!"
-  nil
+  raise "Exception: Form file '#{form_file}' not found!"
 end
 
 #######################################################################
@@ -598,6 +597,14 @@ def clear_login_data
   cookies.delete :remember_me
 end
 
+############################################################################
+# Sets at least default guest user to user roles when no user is set.
+############################################################################
+def set_default_guest_user_role
+  guest = DcPolicyRole.find_by(system_name: 'guest')
+  session[:user_roles] = [guest.id] if guest
+end
+
 ####################################################################
 # Fills session with data related to successful login.
 # 
@@ -610,8 +617,9 @@ def fill_login_data(user, remember_me=false)
   session[:edit_mode]  = 0 
   session[:user_roles] = []
   # Every user has guest role
-  guest = DcPolicyRole.find_by(system_name: 'guest')
-  session[:user_roles] << guest.id if guest
+#  guest = DcPolicyRole.find_by(system_name: 'guest')
+#  session[:user_roles] << guest.id if guest
+  set_default_guest_user_role
   return unless user and user.active  
   # special for SUPERADMIN
   sa = DcPolicyRole.find_by(system_name: 'superadmin')
@@ -715,4 +723,21 @@ def dc_add_meta_tag(type, name, content)
   @meta_tags[key] = content
 end
 
+########################################################################
+# Will prepare flash[:update] data, which will be used for updating fields
+# on forms parent form fields.
+# 
+# Parameters:
+# [field_name] String: Field name
+# [value] String: New value
+# [readonly] Boolean: Field is readonly
+# 
+########################################################################
+def dc_update_form_field(field_name, value, readonly=false)
+  key_name = (readonly ? 'td_' : '') + "record_#{field_name}"
+  flash[:update] ||= {}
+  flash[:update][key_name] = value
+end
+
+
 end

data/app/controllers/dc_common_controller.rb

@@ -45,7 +45,12 @@ layout false
 # JSON array [label, value, id] of first 20 documents that confirm to query.
 ########################################################################
 def autocomplete
-#  return '' unless session[:edit_mode] > 0 # 
+  # table parameter must be defined. If not, get it from search parameter
+  if params['table'].nil? and params['search'].match(/\./)
+    name = params['search'].split('.').first
+    params['table'] = name.underscore
+  end
+  
   return render plain: t('drgcms.not_authorized') unless dc_user_can(DcPermission::CAN_VIEW)
 # TODO Double check if previous line works as it should.
   table = params['table'].classify.constantize
@@ -88,26 +93,24 @@ end
 ##########################################################################
 def toggle_edit_mode
   session[:edit_mode] ||= 0 
-# called without logged in  
-  if session[:edit_mode] < 1 
-    dc_render_404 
-  else
+# error when not logged in  
+  return dc_render_404 if session[:edit_mode] < 1 
 # if return_to_ypos parameter is present it will forward it and thus scroll to
 # aproximate position it was when toggle was clicked
-    session[:edit_mode] = (session[:edit_mode] == 1) ? 2 : 1
-    uri = Rack::Utils.parse_nested_query(request.url)
+  session[:edit_mode] = (session[:edit_mode] == 1) ? 2 : 1
+  uri = Rack::Utils.parse_nested_query(request.url)
 # it parses only on & so first (return_to) parameter also contains url
-    url = uri.first.last
-    if (i = url.index('?return_to_ypos')).to_i > 0
-      url = url[0,i]
-    end 
+  url = uri.first.last
+  if (i = url.index('return_to_ypos')).to_i > 0
+    url = url[0,i-1]
+  end 
 # offset CMS menu
-    if (ypos = uri['return_to_ypos'].to_i) > 0
-      ypos += session[:edit_mode] == 2 ? 250 : -250
-    end
-    url << "?return_to_ypos=#{ypos}"
-    redirect_to url
+  if (ypos = uri['return_to_ypos'].to_i) > 0
+    ypos += session[:edit_mode] == 2 ? 250 : -250
   end
+  url << (url.match(/\?/) ? '&' : '?')
+  url << "return_to_ypos=#{ypos}"
+  redirect_to url
 end
 
 ####################################################################

data/app/{controllers → controls}/dc_page_control.rb

@@ -31,12 +31,29 @@ module DcPageControl
 # Called when new empty record is created
 ######################################################################
 def dc_new_record()
-  @record.design_id = params[:design_id] if params[:design_id]
-  return unless params[:page_id]
-#
-  if page = DcPage.find(params[:page_id])
-    @record.design_id = page.design_id
-    @record.menu      = page.menu
+  # Called from menu. Fill in values, that could be obtained from menu
+  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
 
@@ -44,8 +61,7 @@ end
 # Called just after record is saved to DB.
 ######################################################################
 def dc_after_save()
-  if params[:_record] and params[:_record][:_update_menu] == '1'
-#    menu_class = dc_get_site.menu_class.classify.constantize
+  if params.dig(:_record,:_update_menu).to_s == '1'
     dc_get_site.menu_klass.update_menu_item_link(@record)
   end
 end

data/app/controls/dc_poll_result_control.rb

@@ -0,0 +1,88 @@
+#encoding: utf-8
+#--
+# 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 DcPollResultControl
+
+######################################################################
+# Filter result data when filter is set
+######################################################################
+def poll_filter()
+  get_query
+end
+
+######################################################################
+# Filter action called. Update url to reflect filter conditions and reload form.
+######################################################################
+def do_filter
+  url = url_for(controller: :cmsedit, action: :index, table: :dc_poll_result,
+                'record[dc_poll_id]' => params[:record][:dc_poll_id],
+                'record[start_date]' => params[:record][:start_date],
+                'record[end_date]'   => params[:record][:end_date]
+               )
+  dc_render_ajax(operation: :url, value: url)
+end
+
+######################################################################
+# Export data to file
+######################################################################
+def do_export
+  c, keys = '', []
+  get_query.to_a.each do |doc|
+    # ensure, that fields are always in same order
+    data = YAML.load(doc.data)
+    if c.blank?
+      data.each {|k,v| keys << k}
+      c << I18n.t('helpers.label.dc_poll_result.created_at') + "\t"
+      c << keys.join("\t") + "\n"
+    end
+    c << doc.created_at.strftime(I18n.t('date.formats.default') ) + "\t"
+    keys.each {|k| c << data[k] + "\t"}
+    c << "\n"
+  end
+  File.write(Rails.root.join('public','export.csv'), c)
+  dc_render_ajax(operation: :window, value: 'export.csv')
+end
+
+private
+######################################################################
+# Creates query for Poll results
+######################################################################
+def get_query()
+  if params.dig(:record,:dc_poll_id).nil?
+    qry = DcPollResult.all
+  else  
+    qry = DcPollResult.where(dc_poll_id: params[:record][:dc_poll_id])
+    unless params[:record][:start_date].blank?
+      start_date = DrgcmsFormFields::DatePicker.get_data(params,'start_date').beginning_of_day
+      end_date   = DrgcmsFormFields::DatePicker.get_data(params,'end_date').end_of_day
+      qry = qry.and(:created_at.gt => start_date).and(:created_at.lt => end_date)
+    end
+  end
+  qry
+end
+
+end 

data/app/forms/all_options.yml

@@ -7,9 +7,16 @@ controls: controls_file
 readonly: 1
 permissions:
   can_view: role_name
+  
+script: "
+javascript code
+"
 
 index:
   filter: name, id as text_field
+  select_fields: id,name
+  deny_fields: body,email
+  
   actions: standard
   
   actions:
@@ -18,6 +25,7 @@ index:
     3: sort
     
   actions:
+    standard: yes    
     1: 
       type: new
       caption: Alternative caption
@@ -51,7 +59,7 @@ result_set:
   table_class: tclass
   tr_style: 'color: green;'
   tr_class: trclass
-  tr_class: 
+  tr_style: 
     eval: "document['result'] < 0 ? 'color: red;' : 'color: #000;'"
   
   actions: standard
@@ -107,8 +115,7 @@ form:
   title:
     edit: Title for edit
     show: Title for show
-  labels_pos: top
-    
+  labels_pos: top    
 
   actions: standard
   actions: none
@@ -120,6 +127,7 @@ form:
       action: action
       method: (get),put,post
       caption: ajax_call
+      control: control_name.method_to_call
       when_new: false
     5: 
       type: window

data/app/forms/cms_menu.yml

@@ -45,38 +45,42 @@ menu:
       50: 
         caption: helpers.label.dc_piece.tabletitle
         controller: cmsedit
-        icon: puzzle-piece lg        
+        icon: puzzle-piece lg
         table: dc_piece
       60: 
         caption: helpers.label.dc_link.tabletitle
         controller: cmsedit
-        icon: link lg        
+        icon: link lg
         table: dc_link
       70: 
         caption: helpers.label.dc_menu.tabletitle
         controller: cmsedit
-        icon: th-list lg        
+        icon: th-list lg
         table: dc_menu
       80: 
         caption: helpers.label.dc_simple_menu.tabletitle
         controller: cmsedit
-        icon: ellipsis-h lg        
+        icon: ellipsis-h lg
         table: dc_simple_menu
       90: 
         caption: helpers.label.dc_category.tabletitle
         controller: cmsedit
-        icon: list lg        
+        icon: list lg
         table: dc_category
-          
       100: 
         caption: helpers.label.dc_poll.tabletitle
         controller: cmsedit
-        icon: list-alt lg        
+        icon: list-alt lg
         table: dc_poll
       110: 
+        caption: helpers.label.dc_poll_result.tabletitle
+        controller: cmsedit
+        icon: database lg
+        table: dc_poll_result
+      120: 
         caption: helpers.label.dc_ad.tabletitle
         controller: cmsedit
-        icon: money lg        
+        icon: money lg
         table: dc_ad
 
   11_system_menu:
@@ -86,52 +90,52 @@ menu:
       10: 
         caption: helpers.label.dc_user.tabletitle
         controller: cmsedit
-        icon: users lg        
+        icon: users lg
         table: dc_user
       20: 
         caption: helpers.label.dc_policy_role.tabletitle
         controller: cmsedit
-        icon: user-secret lg        
+        icon: user-secret lg
         table: dc_policy_role
       30: 
         caption: helpers.label.dc_permission.tabletitle
         controller: cmsedit
-        icon: shield lg        
+        icon: shield lg
         table: dc_permission
       40: 
         caption: helpers.label.dc_folder_permission.tabletitle
         controller: cmsedit
-        icon: shield lg        
+        icon: shield lg
         table: dc_folder_permission
       60: 
         caption: helpers.label.dc_big_table.tabletitle
         controller: cmsedit
-        icon: table lg        
+        icon: table lg
         table: dc_big_table
       70: 
         caption: helpers.label.dc_key_value_store.tabletitle
         controller: cmsedit
-        icon: list lg        
+        icon: list lg
         table: dc_key_value_store
       80: 
         caption: helpers.label.dc_filter.tabletitle
         controller: cmsedit
-        icon: filter lg        
+        icon: filter lg
         table: dc_filter
       90: 
         caption: helpers.label.dc_removed_url.tabletitle
         controller: cmsedit
-        icon: trash-o lg        
+        icon: trash-o lg
         table: dc_removed_url
       500: 
         caption: helpers.label.dc_journal.tabletitle
         controller: cmsedit
-        icon: undo lg        
+        icon: undo lg
         table: dc_journal
 
       600: 
         caption: drgcms.browse_collections
         controller: cmsedit
-        icon: table lg        
+        icon: table lg
         table: dc_memory
         form_name: dc_browse_models

data/app/forms/dc_design.yml

@@ -4,7 +4,7 @@ title: Site design
 table: dc_design
 
 index:
-  filter: description, body as text_field
+  filter: description, body as text_field, site_id
   actions: standard
 
 result_set:
@@ -17,9 +17,12 @@ result_set:
     3: delete
 
   columns:
-    2: 
+    10: 
       name: description
-      width: 80%
+      width: 50%
+    20: 
+      name: updated_at
+      
 
 form:
   title: 

data/app/forms/dc_filter.yml

@@ -29,15 +29,13 @@ form:
     10:
       name: description
       type: text_field
-      html:
-        size: 50
+      size: 50
    
     20:
       name: table
       type: text_with_select
       eval: dc_choices4_all_collections      
-      html:
-        size: 30
+      size: 30
 
     30:
       name: dc_user_id
@@ -52,5 +50,4 @@ form:
     50:
       name: filter
       type: text_area
-      html:
-        size: 80x20
+      size: 80x20