drg_cms 0.6.0.3 → 0.6.0.6

data/app/models/drgcms_form_fields/readonly.rb

@@ -69,7 +69,7 @@ def render
       eval( "#{@yaml['eval']} '#{@record[ @yaml['name'] ]}'") 
     end
   else
-    @parent.dc_format_value(@record[@yaml['name']],@yaml['format'])    
+    @parent.dc_format_value(@record.send(@yaml['name']),@yaml['format'])    
   end  
   @html << '</div>'
   self

data/app/models/drgcms_form_fields/select.rb

@@ -99,8 +99,19 @@ def choices_in_eval(e, all=false)
     eval e
   else
     # add event listener to depend field
-    @js << "$('#record_#{@yaml['depend']}').change( function(e) { update_select_depend('#{@yaml['name']}', '#{@yaml['depend']}','#{e}');})\n"
-    depend_value = @record[@yaml['depend']]
+    @js << %Q[
+$(document).ready(function() {
+  $('#record_#{@yaml['depend']}').change( function(e) { update_select_depend('record_#{@yaml['name']}', 'record_#{@yaml['depend']}','#{e}');});
+  $('#_record_#{@yaml['depend']}').change( function(e) { update_select_depend('record_#{@yaml['name']}', '_record_#{@yaml['depend']}','#{e}');});
+});
+]
+    # depend field might be virtual field. Its value should be set in params
+    depend_value = if @yaml['depend'][0] == '_'
+      @parent.params["p_#{@yaml['depend']}"]
+    else
+      @record[@yaml['depend']]
+    end
+    
     e << " '#{depend_value}'"
     eval e
   end
@@ -133,6 +144,7 @@ end
 # Return value when readonly is required
 ###########################################################################
 def ro_standard
+  #value   = @yaml['html']['value'] ? @yaml['html']['value'] : nil
   value = @record.respond_to?(@yaml['name']) ? @record[@yaml['name']] : nil
   return self if value.nil?
 # 

data/app/models/drgcms_form_fields/text_area.rb

@@ -52,7 +52,7 @@ end
 # Render text_area field html code
 ###########################################################################
 def render
-  return ro_standard if @readonly
+  #return ro_standard if @readonly
   set_initial_value
 #
 #  @yaml['html'] ||= {}

data/app/models/drgcms_form_fields/text_autocomplete.rb

@@ -90,7 +90,7 @@ def render
     value_displayed = record ? record.send(ret_name) : value
   end
 # return if readonly
-  return ro_standard(value_displayed) if @readonly
+  #return ro_standard(value_displayed) if @readonly
 # Add method back, so autocomplete will know that it must search for method inside class
   ret_name = "#{ret_name}.#{method}" if method
   @yaml['html'] ||= {}

data/app/models/drgcms_form_fields/text_field.rb

@@ -44,7 +44,7 @@ class TextField < DrgcmsField
 # Render text_field field html code
 ###########################################################################
 def render
-  return ro_standard if @readonly
+  #return ro_standard if @readonly
   set_initial_value
 #
   record = record_text_for(@yaml['name'])

data/app/models/drgcms_form_fields/text_with_select.rb

@@ -65,14 +65,17 @@ class TextWithSelect < Select
 # Render text_with_select field html code
 ###########################################################################
 def render
-  return ro_standard if @readonly  
+  #return ro_standard if @readonly  
   set_initial_value('html','value')
   
   record = record_text_for(@yaml['name'])
   @html << @parent.text_field( record, @yaml['name'], @yaml['html']) 
-  @yaml['html']['class'] = 'text-with-select'
+  @yaml['html']['class'] ||= ''
+  @yaml['html']['class'] <<  ' text-with-select'
   @yaml['html'].symbolize_keys!
-  @html << @parent.select( @yaml['name'] + '_', nil, get_choices, { include_blank: true }, { class: 'text-with-select' })
+  unless @readonly
+    @html << @parent.select( @yaml['name'] + '_', nil, get_choices, { include_blank: true }, { class: 'text-with-select' })
+  end
 
   # javascript to update text field if new value is selected in select field
   @js =<<EOJS

data/app/models/drgcms_form_fields/tree_select.rb

@@ -87,12 +87,13 @@ end
 # Render tree_select field html code
 ###########################################################################
 def render
-  return ro_standard if @readonly  
+  #return ro_standard if @readonly  
   set_initial_value('html','value')
   require 'sort_alphabetical'  
   
   record = record_text_for(@yaml['name'])
-  @html << "<div id=\"#{@yaml['name']}\" class=\"tree-select\" #{set_style()} >"
+  clas   = 'tree-select' + (@readonly ? ' dc-readonly' : '')
+  @html << "<div id=\"#{@yaml['name']}\" class=\"#{clas}\" #{set_style()} >"
 # Fill @choices hash. The key is parent object id
   @choices = {}
   choices_in_eval(@yaml['eval']).each do |data| 
@@ -118,13 +119,20 @@ def render
 # save multiple indicator for data processing on return
   @html << @parent.hidden_field(record, "#{@yaml['name']}_multiple", value: 1) if @yaml['multiple']
 # javascript to update hidden record field when tree looses focus
+readonly_code = %Q[
+,
+"conditionalselect" : function (node) {
+return false; }
+]
+
   @js =<<EOJS
 $(function(){
   $("##{@yaml['name']}").jstree( {
     "checkbox" : {"three_state" : false},        
     "core" : { "themes" : { "icons": false },
                "multiple" : #{@yaml['multiple'] ? 'true' : 'false'}  },
-    "plugins" : ["checkbox"]
+    "plugins" : ["checkbox","conditionalselect"]
+    #{@readonly ? readonly_code : ''}
   });
 });
   

data/app/renderers/dc_poll_renderer.rb

@@ -59,9 +59,11 @@ def do_one_item(poll, yaml)
 # 
   text = yaml['text'].match(/\./) ? t(yaml['text']) : yaml['text'] 
   if yaml['mandatory']
-    text << '<font color="red"> *</font>' 
+    text << ( poll.display == 'in' ? ' *' : '<font color="red"> *</font>' )
     yaml['html'] ||= {}
     yaml['html']['required'] = true
+  else
+    text << " &nbsp;" if poll.display == 'lr' and !yaml['type'].match(/submit_tag|link_to/)
   end
   
 # Just add text if comment and go to next one    
@@ -114,7 +116,7 @@ def do_one_item(poll, yaml)
         html << captcha.render_html
         @part_css = captcha.render_css
       end
-      @end_od_data = true
+      @end_of_data = true
     end
 # submit and link tag 
     clas = yaml['type'].match(/submit_tag/) ? '' : 'dc-link-submit'
@@ -123,15 +125,33 @@ def do_one_item(poll, yaml)
   else
     html << case
       when poll.display == 'lr' then
-      "<div class='row-div'><div class='dc-form-label poll-data-text #{yaml['class']}'>#{text}</div><div class='dc-form-field poll-data-field #{yaml['class']}'>#{field_html}</div></div>\n"
-      when poll.display == 'tb' then
-      "<div class='poll-data-text #{yaml['class']}'>#{text}</div><div class='poll-data-field #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
+      "<div class='row-div'><div class='dc-form-label poll-data-text lr #{yaml['class']}'>#{text}</div><div class='poll-data-field td #{yaml['class']}'>#{field_html}</div></div>\n"
+      when poll.display == 'td' then
+      "<div class='poll-data-text td #{yaml['class']}'>#{text}</div><div class='poll-data-field td #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
       else
-      "<div class='poll-data-field #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
+      "<div class='poll-data-field in #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
     end    
   end
 end
 
+########################################################################
+# Call method before poll is displayed. Usefull for filling predefined values into flash[:record][value]
+# Method cane be defined as ClassName.method or only method. 
+# If only method is defined then method name must exist in helpers.
+# 
+# Called method must return at least one result if process can continue.
+########################################################################
+def eval_pre_display(code)
+  a = code.strip.split('.')
+  if a.size == 1
+    continue, message = @parent.send(a.first)
+  else
+    klass = a.first.classify.constantize
+    continue, message = klass.send(a.last,@parent)
+  end
+  [continue, message]
+end
+
 ########################################################################
 # Default poll renderer method. Renders data for specified pool.
 ########################################################################
@@ -149,12 +169,10 @@ def default
   
   html = @opts[:div] ? "<div id='#{@opts[:div]}'>" : ''
   html << '<a name="poll-top"></a>'
-
-  # Operation called before poll is displayed. Usefull for filling predefined values into flash[:record][value]
-  # Called method must return at least one result if process can continue.
-  if poll.pre_display.to_s.size > 1
+  #
+  unless poll.pre_display.blank?
     begin
-      continue, message = eval(poll.pre_display.strip + '(@parent)')
+      continue, message = eval_pre_display(poll.pre_display)
     rescue Exception => e
       return "<div class=\"dc-form-error\">Error! Poll pre display. Error: #{e.message}</div>" 
     end

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

@@ -1,11 +1,9 @@
 <div id="cmsedit-div">
-  <div class="cms-toggle mode-<%= session[:edit_mode] %>" title="<%= t('drgcms.toggle_cms')%>">CMS</div>
-  <%= link_to('CMS', controller: 'dc_common', action: 'toggle_edit_mode', return_to: request.url) %>
+  <button class="cms-toggle mode-<%= session[:edit_mode] %>" title="<%= t('drgcms.toggle_cms')%>">CMS</button>
+  <% # = link_to('CMS', controller: 'dc_common', action: 'toggle_edit_mode', return_to: request.url) %>
   <% if session[:edit_mode] > 1 %>
     <div class="cmsedit-table cmsedit-top">
       <div id="menu">
-        
-        <%= 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')}"),

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

@@ -4,12 +4,13 @@
 
 <div class="dc-form-frame">
 
-  <%= dc_actions_for_form %>
+  <%= dc_actions_for_form 'top' %>
   
   <%= dc_fields_for_form %>
   <%= dc_document_statistics %>
 
-  <%= dc_actions_for_form %>
+  <%= dc_actions_for_form 'bottom' %>
 </div>
 
-<%= javascript_tag(@js) unless @js.blank? %>
+<%= javascript_tag(@js)  unless @js.blank? %>
+<% unless @css.blank? %><style type="text/css"><%= @css %></style><% end %>

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

@@ -1,8 +1,6 @@
 
 <div class="dc-table-frame">
 
-  <%= dc_table_title_for_result @records %>
-
   <% unless @records.nil? %>
       <%= dc_background_for_result(:start) %>
   
@@ -15,12 +13,13 @@
       <% end %>
       <% if @record_footer %>
         <div class="dc-result-data footer">
-        <%= ignore, code = dc_actions_column(); code.html_safe %></div>
+        <%= dc_actions_column_for_footer() %>
         <%= dc_columns_for_result(@record_footer) %>
         </div>
       <% end %>
         
       <%= dc_background_for_result(:end) %>
   <% end %>
+  <%= dc_filter_popup() %>
   
 </div>

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

@@ -1,5 +1,6 @@
+<%= dc_head_for_form %>
 <%= dc_table_title dc_edit_title() %>
 
-<%= form_tag @parms, method: :put, id: 'cmsform' do %>
+<%= form_tag( @parms, method: :put, id: 'cmsform', multipart: @form['form']['multipart'] ) do %>
   <%= render partial: 'form' %>
 <% end %>

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

@@ -1,6 +1,11 @@
 <div class="dc-form-frame">
+  <%= dc_table_title_for_result @records %>
+
   <%= dc_actions_for_index %>
   <%= dc_div_filter %>
   <%= dc_flash_messages %> 
   <div id='result'> <%= render partial: 'result' %></div>
-</div>
+</div>
+
+<%= javascript_tag(@js) unless @js.blank? %>
+<% unless @css.blank? %><style type="text/css"><%= @css %></style><% end %>

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

@@ -1,5 +1,5 @@
 <%= dc_table_title dc_new_title() %>
 
-<%= form_tag @parms, method: :post, id: 'cmsform' do %>
+<%= form_tag( @parms, method: :post, id: 'cmsform', multipart: @form['form']['multipart'] ) do %>
   <%= render partial: 'form' %>
 <% end %>

data/config/locales/drgcms_en.yml

@@ -24,6 +24,8 @@
 # English (en) localization for drgCMS
 en:
   drgcms:
+    "true": "yes"
+    "false": "no"
     record_deleted: Document deleted!
     confirm_delete: Confirm document deletion!
     confirm_dup: Confirm document duplication!
@@ -94,6 +96,11 @@ en:
     created_at: Created at
     updated_at: Updated at
     new_record: New record
+    
+    filter_poll: Filter
+    filter_poll_title: Filter poll data
+    export_poll: Export
+    export_poll_title: Upload poll data in a file
 
     choices4_filter_operators: 'Equal to:eq,Contains:like,Greater then:gt,Less then:lt,Is empty:empty'
     

data/config/locales/drgcms_sl.yml

@@ -23,7 +23,9 @@
 
 # drgCMS slovenska (sl) lokalizacija 
 sl:
-  drgcms:
+  drgcms:  
+    "true": "da"
+    "false": "ne"    
     record_deleted: Dokument izbrisan!
     confirm_delete: Potrdite izbris dokumenta!
     confirm_dup: Potrdite podvajanje dokumenta!
@@ -94,6 +96,11 @@ sl:
     created_at: Ustvarjeno
     updated_at: Spremenjeno
     new_record: Nov zapis
+    
+    filter_poll: Filter
+    filter_poll_title: Filtriraj podatke
+    export_poll: Izvoz
+    export_poll_title: Izvoz in prenos rezultatov ankete v datoteko
 
     choices4_filter_operators: 'Je enak:eq,Vsebuje:like,Je večji od:gt,Je manjši od:lt,Je prazen:empty'
     

data/config/locales/models_en.yml

@@ -81,6 +81,7 @@ en:
         rails_view: Rails view filename
         control: Control file
         control_method: Control method
+        updated_at: Updated
 
       dc_user_role:
         tabletitle: User roles
@@ -157,6 +158,13 @@ en:
         options: Options
         order: Order
         active: Active
+        
+      dc_poll_result:
+        tabletitle: Polls results
+
+        dc_poll_id: Poll name
+        created_at: Created date
+        data: Data
 
       dc_policy:
         tabletitle: Access policy declarations
@@ -653,10 +661,6 @@ en:
         form: You can specified input items by providing form acording to rules of drgCMS form.
 
       dc_poll_item:
-        tabletitle: Poll items
-        choices4_type: Text:text_field,Text area:text_area,Select:select,Check box:check_box,Submit:submit_tag,Link:link_to,Password:password_field,Comment:comment
-        choices4_separator: Space:&nbsp;,Empty line:<br />,Horizontal line:<hr>
-
         name: Name (alias) of returned field name
         text: Caption of item
         type: Input item type
@@ -667,6 +671,11 @@ en:
         order: Order of item on poll
         active: Item is active        
 
+      dc_poll_result:
+        dc_poll_id: Poll name 
+        created_at: Date when poll result was submited
+        data: Data saved in YAML format
+
       dc_policy:
         name: Unique policy name
         description: Description for this policy

data/config/locales/models_sl.yml

@@ -82,7 +82,7 @@ sl:
         site_id: Spletišče
         control: Kontrolna datoteka
         control_method: Kontrolna metoda
-        
+        updated_at: Spremenjeno
 
       dc_user:
         tabletitle: Uporabniki
@@ -160,6 +160,13 @@ sl:
         options: Opcije
         order: Zaporedje
         active: Aktivna
+        
+      dc_poll_result:
+        tabletitle: Rezultati anket
+
+        dc_poll_id: Anketa
+        created_at: Nastalo
+        data: Podatki
 
       dc_policy:
         tabletitle: Politike za dostop
@@ -635,7 +642,6 @@ sl:
         password_confirmation: Še enkrat vpišite geslo
         signature: Podpis, ki se doda k vsakemu sporočilu tega uporabnika
 
-
       dc_user_role:
         dc_policy_role_id: Uporabnikova vloga
         has_cms_menu: Vloga dovoljuje prikaz opcije za CMS menu
@@ -668,6 +674,11 @@ sl:
         options: Opcije, odvisne od vrste vpisnega polja
         order: Zaporedje prikaza na anketi
         active: Vrstica je aktivna
+        
+      dc_poll_result:
+        dc_poll_id: Naziv ankete
+        created_at: Čas nastanka zapisa
+        data: Podatki v YAML formatu
 
       dc_policy:
         name: Naziv politike

data/drg_cms.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'non-stupid-digest-assets'  
 
   s.add_dependency 'bcrypt' #, '~> 3.0.0'
-  s.add_dependency 'mongoid', '~> 7.0.5'
+  s.add_dependency 'mongoid', '~> 7'
 
   s.add_dependency 'kaminari-mongoid'
   s.add_dependency 'kaminari-actionview'

data/lib/drg_cms.rb

@@ -140,6 +140,7 @@ def self.routes
       get 'dc_common/add_json_ld_schema'    => :add_json_ld_schema
     end
     match 'elfinder' => 'dc_elfinder#connector', via: [:get, :post]
+    match 'cmsedit/run' => 'cmsedit#run', via: [:get, :put, :post]
     resources :cmsedit
     resources :cms, controller: :cmsedit
   end

data/lib/drg_cms/version.rb

@@ -23,5 +23,5 @@
 
 # drg_cms gem version
 module DrgCms #:nodoc:
-  VERSION = '0.6.0.3'
+  VERSION = '0.6.0.6'
 end