drg_cms 0.5.50.2 → 0.5.51.1

data/app/models/dc_user.rb

@@ -21,114 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-#########################################################################
-# ActiveSupport::Concern definition for DcUser class. 
-#########################################################################
-module DcUserConcern
-extend ActiveSupport::Concern
-included do
-@@countries = nil
-
-include Mongoid::Document
-include Mongoid::Timestamps
-include ActiveModel::SecurePassword
-
-field :username,    type: String, default: ''
-field :title,       type: String, default: ''
-field :first_name,  type: String, default: ''
-field :middle_name, type: String, default: ''
-field :last_name,   type: String, default: ''
-field :name,        type: String
-field :company,     type: String, default: ''
-field :address,     type: String
-field :post,        type: String
-field :country,     type: String
-field :phone,       type: String
-field :email,       type: String
-field :www,         type: String
-field :picture,     type: String
-field :birthdate,   type: Date
-field :about,       type: String
-field :last_visit,  type: Time
-field :active,      type: Boolean, default: true
-field :valid_from,  type: Date
-field :valid_to,    type: Date
-field :created_by,  type: BSON::ObjectId
-field :updated_by,  type: BSON::ObjectId
-
-field :type,        type: Integer, default: 0 # 0 => User, 1 => Group
-field :members,     type: Array
-
-embeds_many :dc_user_roles
-
-# for forum
-field :signature,   type: String
-field :interests,   type: String
-field :job_occup,   type: String
-field :description, type: String  
-field :reg_date,    type: Date
-
-field :password_digest,  type: String
-has_secure_password
-
-index( { username: 1 }, { unique: true } )
-index( { email: 1 }, { unique: true } )
-index 'dc_user_roles.dc_policy_role_id' => 1  
-
-index 'members' => 1  
-
-validates_length_of :username, minimum: 4
-before_save :do_before_save
-
-##########################################################################
-# before_save callback takes care of name field and ensures that e-mail is unique 
-# when entry is left empty. 
-##########################################################################
-def do_before_save
-  self.name  = "#{self.title} #{self.first_name} #{self.middle_name + ' ' unless self.middle_name.blank?}#{self.last_name}".strip
-# to ensure unique e-mail            
-  self.email = "unknown@#{self.id}" if self.email.to_s.strip.size < 5
-end  
-
-##########################################################################
-# Will return all possible values for country field ready for input in select field. 
-# Values are loaded from github when method is first called.
-##########################################################################
-def self.choices4_country()
-  if @@countries.nil?
-    uri = URI.parse("https://raw.githubusercontent.com/umpirsky/country-list/master/country/cldr/en/country.json")
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true
-
-    request = Net::HTTP::Get.new(uri.request_uri)
-    response = http.request(request)    
-    @@countries = JSON.parse(response.body).to_a.inject([]) {|result, e| result << [e[1], e[0]] }
-  end
-  @@countries
-end
-
-##########################################################################
-# Performs ligically test on passed email parameter.
-# 
-# Parameters:
-# [email] String: e-mail address
-# 
-# Returns:
-# Boolean: True if parameter is logically valid email address.
-# 
-# Example:
-#    if !DcUser.is_email?(params[:email])
-#      flash[:error] = 'e-Mail address is not valid!'
-#    end
-# 
-##########################################################################
-def self.is_email?(email)
-  email.to_s =~ /^[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]\.[a-zA-Z][a-zA-Z\.]*[a-zA-Z]$/
-end
-
-end
-end
-
 ########################################################################
 # == Schema information
 #

data/app/models/drgcms_form_fields.rb

@@ -130,7 +130,7 @@ end
 #    params['p_picture'] = '/path/to_picture'
 #    
 # When multiple initial values are assigned it is more convinient to assign them 
-# through flash method.
+# through flash object.
 #    flash[:record] = {}
 #    flash[:record]['picture'] = '/path/to_picture'
 ####################################################################
@@ -144,6 +144,40 @@ def set_initial_value(opt1='html', opt2='value')
   end
 end
 
+####################################################################
+# Returns style html code for DRGForm object if style directive is present in field definition.
+# Otherwiese returns empty string.
+# 
+# Style may be defined like:
+#    style:
+#      height: 400px
+#      width: 800px
+#      padding: 10px 20px
+#     
+#    or 
+#     
+#    style: "height:400px; width:800px; padding: 10px 20px;"
+#    
+#  Style directive may also be defined under html directive.
+#    html:
+#      style:
+#        height: 400px
+#        width: 800px
+#    
+# 
+####################################################################
+def set_style()
+  style = @yaml['html']['style'] || @yaml['style']
+  case
+    when style.nil? then ''
+    when style.class == String then "style=\"#{style}\""
+    when style.class == Hash then
+      value = style.to_a.inject([]) {|r,v| r << "#{v[0]}: #{v[1]}" }.join(';')
+      "style=\"#{value}\"" 
+    else ''
+  end 
+end
+
 ####################################################################
 # Will return ruby hash formated as javascript string which can be used
 # for passing parameters in javascript code.
@@ -164,10 +198,7 @@ end
 #      
 ####################################################################
 def hash_to_options(hash)
-  options = hash.to_a.inject('') do |r,v|
-    r << "#{v[0]}: #{v[1]},"
-  end
-  options.chomp(',')
+  hash.to_a.inject([]) {|r,v| r << "#{v[0]}: #{v[1]}" }.join(',')
 end
 
 ####################################################################
@@ -585,7 +616,8 @@ end
 def get_choices
   begin
     choices = case 
-    when @yaml['choices'] then @yaml['choices']
+    when @yaml['choices'] then 
+      (@yaml['choices'].match('helpers.') ) ? t(@yaml['choices']) : @yaml['choices']
     when @yaml['eval']    then
       do_eval(@yaml['eval'])
     else 
@@ -659,8 +691,10 @@ def self.get_data(params, name)
   if params['record'][name].class == Array
     params['record'][name].delete_if {|e| e.blank? }
     return nil if params['record'][name].size == 0
-# convert to BSON objects    
-    return params['record'][name].map{ |e| BSON::ObjectId.from_string(e) }
+# convert to BSON objects   
+    is_id = BSON::ObjectId.legal?(params['record'][name].first)
+    return params['record'][name].map{ |e| BSON::ObjectId.from_string(e) } if is_id
+    return params['record'][name]
   end
   params['record'][name]
 end
@@ -885,24 +919,14 @@ def render
   self
 end
 
-####################################################################
-# Get data for DateSelect field
-# According to  https://gist.github.com/315227
-####################################################################
+###########################################################################
+# DatetimeSelect get_data method.
+###########################################################################
 def self.get_data(params, name)
-  attrs = params['record'].collect do |key, value|
-    if key =~ /^#{Regexp.escape(name.to_s)}\((\d+)(\w)\)$/
-      [$1.to_i, value.send("to_#$2")]
-    end
-  end.compact.sort_by(&:first).map(&:last)
-# Return nil if error
-  begin
-    Time.zone.local(*attrs) #unless attrs.empty?
-  rescue 
-    nil
-  end
+  DatetimeSelect.get_data(params, name).to_date rescue nil
 end
 
+
 end
 
 ###########################################################################
@@ -939,11 +963,16 @@ def render
   self
 end
 
-###########################################################################
+####################################################################
 # DatetimeSelect get_data method.
-###########################################################################
+####################################################################
 def self.get_data(params, name)
-  DateSelect.get_data(params, name)
+  begin
+    attrs = (1..5).map { |i| params['record']["#{name}(#{i}i)"]}
+    Time.zone.local(*attrs) 
+  rescue 
+    nil
+  end
 end
 
 end
@@ -1346,6 +1375,138 @@ EOJS
 end
 end
 
+###########################################################################
+# Implementation of tree_select DRG CMS form field. Field will provides
+# multiple select functionality displayed as a tree. Might be used for selecting
+# multiple categories in a parent-child tree view.# 
+# 
+# ===Form options:
+# * +name:+ field name (required)
+# * +type:+ tree_select (required)
+# * +choices:+ Values for choices separated by comma. Values can also be specified like description:value.
+# In this case description will be shown to user, but value will be saved to document.
+#   choices: 'OK:0,Ready:1,Error:2'
+#   choices: Ruby,Pyton,PHP
+# * +eval:+ Choices will be provided by evaluating expression
+#   eval: ModelName.choices4_field; Model class should define method which will provide data for field. 
+#   Data returned must be of type Array and have 3 elements.
+#   1 - description text
+#   2 - id value
+#   3 - parent id
+# * +html:+ html options which apply to select and text_field fields (optional)
+# 
+# Form example:
+#    10:
+#      name: categories
+#      type: tree_select
+#      eval: 'Categories.all_categories'
+#      html:
+#        size: 50x10
+###########################################################################
+class TreeSelect < Select
+
+###########################################################################
+# Prepare choices for tree data rendering.
+###########################################################################
+def make_tree(parent)
+  return '' unless @choices[parent.to_s]
+  @html << '<ul>'
+  choices = if @choices[parent.to_s].first.last != 0
+    @choices[parent.to_s].sort_by {|e| e[3] } # sort by order if first is not 0
+#    @choices[parent.to_s].sort_alphabetical_by(&:first) # use UTF-8 sort
+  else  
+    @choices[parent.to_s].sort_alphabetical_by(&:first) # use UTF-8 sort
+  end
+  choices.each do |choice|
+    jstree = %Q[{"selected" : #{choice[4] ? 'true' : 'false'} }]
+# data-jstree must be singe quoted
+    @html << %Q[<li data-id="#{choice[1]}" data-jstree='#{jstree}'>#{choice.first}\n]
+# call recursively for children     
+    make_tree(choice[1]) if @choices[ choice[1].to_s ]
+    @html << "</li>"
+  end
+  @html << '</ul>'  
+end
+
+###########################################################################
+# Prepare choices for tree data rendering.
+###########################################################################
+def _make_tree(parent)
+  @html << '<ul>'
+  choices = @choices[parent.to_s].sort_alphabetical_by(&:first) # use UTF-8 sort
+  choices.each do |choice|
+    jstree = %Q[{"selected" : #{choice[4] ? 'true' : 'false'} }]
+# data-jstree must be singe quoted
+    @html << %Q[<li data-id="#{choice[1]}" data-jstree='#{jstree}'>#{choice.first}\n]
+# call recursively for children     
+    make_tree(choice[1]) if @choices[ choice[1].to_s ]
+    @html << "</li>"
+  end
+  @html << '</ul>'  
+end
+
+###########################################################################
+# Render tree_select field html code
+###########################################################################
+def render
+  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()} >"
+# Fill @choices hash. The key is parent object id
+  @choices = {}
+  do_eval(@yaml['eval']).each {|data| @choices[ data[2].to_s ] ||= []; @choices[ data[2].to_s ] << (data << false)}
+# put current values hash with. To speed up selection when there is a lot of categories
+  current_values = {}
+  current = @record[@yaml['name']] || []
+  current = [current] unless current.class == Array # non array fields
+  current.each {|e| current_values[e.to_s] = true}
+# set third element of @choices when selected
+  @choices.keys.each do |key|
+    0.upto( @choices[key].size - 1 ) do |i|
+      choice = @choices[key][i]
+      choice[4] = true if current_values[ choice[1].to_s ]
+    end
+  end
+  make_tree(nil)
+  @html << '</ul></div>'
+# add hidden communication field  
+  @html << @parent.hidden_field(record, @yaml['name'], value: current.join(','))
+# javascript to update hidden record field when tree looses focus
+  @js =<<EOJS
+$(function(){
+  $("##{@yaml['name']}").jstree( {
+    "checkbox" : {"three_state" : false},        
+    "core" : { "themes" : { "icons": false } },
+    "plugins" : ["checkbox"]
+  });
+});
+  
+$(document).ready(function() {
+  $('##{@yaml['name']}').on('focusout', function(e) {
+    var checked_ids = [];
+    var checked = $('##{@yaml['name']}').jstree("get_checked", true);
+    $.each(checked, function() {
+      checked_ids.push( this.data.id );
+    });
+    $('#record_#{@yaml['name']}').val( checked_ids.join(",") );
+  });
+});
+EOJS
+  self
+end
+
+###########################################################################
+# Return value. Return nil if input field is empty
+###########################################################################
+def self.get_data(params, name)
+  params['record'][name].blank? ? nil : params['record'][name].split(',')
+end
+
+end
+
 ###########################################################################
 # Implementation of html_field DRG CMS form field. 
 # 

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

@@ -4,9 +4,9 @@
   <%= dc_table_title_for_result @records %>
 
   <% unless @records.nil? %>
-      <%= dc_background_for_result %>
+      <%= dc_background_for_result(:start) %>
+  
       <tr><%= dc_header_for_result %></tr>
-
       <% for document in @records %>
         <%= dc_row_for_result(document) %>
         <%= dc_actions_for_result(document) %>
@@ -14,8 +14,7 @@
         </tr>
       <% end %>
         
-    </table>
-  </div>
+      <%= dc_background_for_result(:end) %>
   <% end %>
   
 </div>

data/config/locales/models_en.yml

@@ -61,6 +61,7 @@ en:
         rails_view: Rails view
         design: Standard design
         request_processor: Request processor
+        inherit_policy: Policy from site
 
       dc_design:
         tabletitle: Designs
@@ -225,6 +226,7 @@ en:
         link_prepend: Link prepend
         active: Active
         dc_menu_items: Menu items
+        dc_site_id: Site
 
       dc_menu_item:
         tabletitle: Menu items
@@ -498,6 +500,11 @@ en:
         public: Is public
         sort: Default sort        
 
+      dc_memory:
+        fields: General
+        ztab: Advanced
+        dc_element: Element name
+
 # help for forms #####################################################
 
     help:
@@ -528,6 +535,7 @@ en:
         design: Standard design can also be defined at the site level
         dc_parts: Parts contained in site
         request_processor: Method which will provide output instead of dc_process_default_request 
+        inherit_policy: Use policy defined on other site
         
       dc_user:
         username: Username
@@ -633,7 +641,7 @@ en:
         link_prepend: Link field usually holds direct link to document. Prepand field holds data, that has to be prepanded to the link.
         active: Active
         dc_simple_menu: Menu items
-        dc_site_id: Site this menu belongs to
+        dc_site_id: Site to which this menu belongs to
 
       dc_simple_menu_item:
         caption: Caption of menu
@@ -654,7 +662,7 @@ en:
         active: Active
         link_prepend: Link field usually holds direct link to document. Prepand field holds data, that has to be prepanded to the link.
         dc_menu_items: Menu items
-        dc_site_id: Site this menu belongs to
+        dc_site_id: Site to which this menu belongs to
 
       dc_menu_item:
         caption: Caption of menu item
@@ -857,4 +865,4 @@ en:
         filter: Filter definition in YAML
         public: Filter is available to all users
         sort: Default sort when selecting filter
-        
+