drg_cms 0.5.50.2 → 0.5.51.1

data/app/models/dc_menu.rb

@@ -56,10 +56,11 @@ class DcMenu
   field :created_by,  type: BSON::ObjectId
   field :updated_by,  type: BSON::ObjectId
 
-  index( { name: 1 }, { unique: true } )
-
+  belongs_to :dc_site
   embeds_many :dc_menu_items
   
+  index( { name: 1 }, { unique: true } )
+
   validates :name, :length => { :minimum => 4 }
   validates :name, uniqueness: true  
   validates_length_of :description, minimum: 10
@@ -77,7 +78,7 @@ class DcMenu
 # Returns:
 # Array. Of choices prepared for select input field.
 #######################################################################
-  def self.choices4_menu(site)
+def self.choices4_menu(site)
   rez = []
   menus = (site.menu_name.blank? ? all : where(name: site.menu_name)).to_a
   menus.each do |menu|
@@ -88,5 +89,70 @@ class DcMenu
   end
   rez
 end
+  
+#######################################################################
+# Subroutine of choices4_menu_as_tree
+#######################################################################
+def self.do_sub_menu(menus, parent, ids) #:nodoc:
+  result = []
+  menus.each do |item|
+    long_id = "#{ids};#{item.id}"
+    result << [item.caption, long_id, parent, item.order]
+    sub_menus = item.dc_menu_items.order_by(order: 1).to_a
+    result += do_sub_menu(sub_menus, long_id, long_id) if sub_menus.size > 0
+  end
+  result
+end
+
+#######################################################################
+# Will return menu structure for menus belonging to the site.
+# 
+# Parameters: 
+# [Site] DcSite document. Site for which menu belongs to. If site is not specified 
+# all current menus in collection will be returned.
+# 
+# Returns:
+# Array. Of choices prepared for tree:select input field.
+#######################################################################
+def self.choices4_menu_as_tree(site_id=nil)
+  qry = where(active: true)
+# 
+  ar = [nil]
+  if site_id.class == BSON::ObjectId
+    ar << site_id
+  elsif site_id.respond_to?(:id)
+    ar << site_id.id
+  end
+  qry = qry.in(dc_site_id: ar)
+#
+  result = []
+  qry.each do |menu|
+    result << [menu.name, menu.id, nil,0]
+    sub_menus = menu.dc_menu_items.order_by(order: 1).to_a
+    result += do_sub_menu(sub_menus, menu.id, menu.id.to_s) if sub_menus.size > 0
+  end
+  result
+end
+
+#######################################################################
+# Will update link value of selected menu_item
+# 
+# Parameters: 
+# [path] String. String path to MenuItem document, separated by ;
+# [link] String. New value of the link field
+#######################################################################
+def self.update_menu_item_link(path, link)
+  return unless path and link
+# 
+  ar = path.split(';')
+  menu = find(ar.shift)
+  while (item = ar.shift) do
+    menu = menu.dc_menu_items.find(item)
+  end
+  return unless menu.respond_to?(:link) # top level selected
+#  
+  menu.link = link
+  menu.save  
+end
 
 end

data/app/models/dc_menu_item.rb

@@ -63,4 +63,21 @@ class DcMenuItem
   field :updated_by,  type: BSON::ObjectId
 
   embeds_many :dc_menu_items, :cyclic => true
+  
+#######################################################################
+# Will return menu path for the item as array of id-s. Method can be used
+# to determine all parents of current item.
+# 
+# Returns:
+# Array. Of parent items ids.
+#######################################################################
+def menu_path()
+  path, parent = [], self
+  while parent
+    path << parent.id
+    parent = parent._parent
+  end 
+  path.reverse
+end
+  
 end

data/app/models/dc_page.rb

@@ -22,112 +22,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-#########################################################################
-# ActiveSupport::Concern definition for DcPage class. 
-#########################################################################
-module DcPageConcern
-extend ActiveSupport::Concern
-included do
-  
-include Mongoid::Document
-include Mongoid::Timestamps
-
-field :subject,      type: String,  default: ''
-field :title,        type: String
-field :subject_link, type: String,  default: ''
-field :alt_link,     type: String,  default: ''
-field :sub_subject,  type: String,  default: ''
-field :picture,      type: String   
-field :gallery,      type: String   
-field :body,         type: String,  default: ''
-field :css,          type: String,  default: ''
-field :script,       type: String,  default: ''
-field :params,       type: String
-field :menu_id,      type: BSON::ObjectId
-field :author_id,    type: BSON::ObjectId
-field :dc_poll_id,   type: BSON::ObjectId
-field :author_name,  type: String
-field :publish_date, type: DateTime
-field :user_name,    type: String
-field :valid_from,   type: DateTime
-field :valid_to,     type: DateTime
-field :comments,     type: Integer, default: 1  # 0 => not allowed, 1 => allowed
-field :active,       type: Boolean, default: true 
-field :created_by,   type: BSON::ObjectId
-field :updated_by,   type: BSON::ObjectId
-field :kats,         type: Array         # Categories
-
-field :policy_id,    type: BSON::ObjectId
-
-embeds_many :dc_parts
-
-belongs_to  :dc_site
-belongs_to  :dc_design
-
-index  ({ dc_site_id: 1, subject_link: 1 })
-index  kats: 1
-index  alt_link:  1
-
-before_save :do_before_save
-
-validates :publish_date, presence: true
-  
-######################################################################
-protected
-
-######################################################################
-# Clears subject link of chars that shouldn't be there and also takes care 
-# than link size is not larger than 100 chars.
-######################################################################
-def clear_link(link)
-  link.gsub!(/\.|\?|\!\&|»|«|\,|\"|\'|\:/,'')
-  link.gsub!('<br>','')
-  link.gsub!(' ','-')
-  link.gsub!('---','-')
-  link.gsub!('--','-')
-# it shall not be greater than 100 chars. Don't break in the middle of words  
-  if link.size > 100
-    link = link[0,100]
-    link.chop! until link[-1,1] == '-' or link.size < 10 # delete until -
-  end
-  link.chop! if link[-1,1] == '-' # remove - at the end
-  link
-end
-
-######################################################################
-# Implementation of before_save callback.
-######################################################################
-def do_before_save
-  if self.subject_link.empty?
-    self.subject_link = clear_link(self.subject.downcase.strip) 
-    # add date to link, but only if something is written in subject   
-    self.subject_link << self.publish_date.strftime('-%Y%m%d') if self.subject_link.size > 1 
-  end
-end
-
-######################################################################
-# Return all pages belonging to site ready for select input field. Used
-# by dc_menu* forms, for selecting page which will be linked by menu option.
-# 
-# Parameters:
-# [site] Site document.
-######################################################################
-def self.all_pages_for_site(site)
-  where(dc_site_id: site._id, active: true).order(subject: 1).
-    inject([]) { |r,page| r << [ page.subject, page.subject_link] }
-end
-
-########################################################################
-# Return filter options
-########################################################################
-def self.dc_filters
-  {'title' => 'drgcms.filters.this_site_only', 'operation' => 'eq', 
-   'field' => 'dc_site_id', 'value' => '@current_site'}
-end
-
-end
-end
-
 #########################################################################
 # == Schema information
 #

data/app/models/dc_part.rb

@@ -20,7 +20,6 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
-require_dependency DrgCms.model 'dc_piece'
 
 ########################################################################
 # == Schema information

data/app/models/dc_piece.rb

@@ -21,41 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-
-#########################################################################
-# ActiveSupport::Concern definition for DcPiece class. 
-#########################################################################
-module DcPieceConcern
-  extend ActiveSupport::Concern
-  included do
-  
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  field :name,          type: String,  default: ''
-  field :description,   type: String,  default: ''
-  field :picture,       type: String   
-  field :thumbnail,     type: String   
-  field :body,          type: String,  default: ''
-  field :css,           type: String,  default: ''
-  field :script,        type: String,  default: ''
-  field :script_type,   type: String,  default: ''
-  field :params,        type: String,  default: ''
-  field :piece_id,      type: BSON::ObjectId
-  field :div_id,        type: String
-  field :site_id,       type: BSON::ObjectId
-  field :order,         type: Integer, default: 0
-  field :active,        type: Boolean, default: true  
-  field :valid_from,    type: DateTime
-  field :valid_to,      type: DateTime
-  
-  field :created_by,    type: BSON::ObjectId
-  field :updated_by,    type: BSON::ObjectId  
-  
-  validates :name, presence: true
-end
-end
-
 ########################################################################
 # == Schema information
 #

data/app/models/dc_policy_rule.rb

@@ -21,62 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-#########################################################################
-# ActiveSupport::Concern definition for DcPolicyRule class. 
-#########################################################################
-module DcPolicyRuleConcern
-  extend ActiveSupport::Concern
-  included do
-
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  belongs_to :dc_policy_role
-
-  field      :permission,    type: Integer, default: 0
-
-  embedded_in :policy_rules, polymorphic: true 
-
-#########################################################################
-# Returns values for permissions ready to be used in select field.
-#
-# Example (as used in DRG CMS form): 
-#    20:
-#      name: permission
-#      type: select
-#      eval: DcPolicyRule.values_for_permissions
-#########################################################################
-def self.values_for_permissions
-  key = 'helpers.label.dc_policy_rule.choices4_permission'
-  c = I18n.t(key)  
-  c = I18n.t(key, locale: 'en') if c.class == Hash or c.match( 'translation missing' )
-  c.split(',').inject([]) {|r,e| r << (ar = e.split(':'); [ar.first, ar.last.to_i]) }
-end
-
-#########################################################################
-# Will return translated permission name for value.
-# 
-# Parameters:
-# [value] Integer. Permission value
-# 
-# Example (as used in DRG CMS form):
-#    result_set:
-#      columns:
-#        2: 
-#          name: permission
-#          eval: DcPolicyRule.permission_name_for_value
-# 
-# Returns:
-# String. Name (description) for value
-#########################################################################
-def self.permission_name_for_value(value)
-  values_for_permissions.each {|v| return v.first if v.last.to_i == value.to_i}
-  'error'
-end
-
-end
-end
-
 #########################################################################
 # == Schema information
 #

data/app/models/dc_simple_menu.rb

@@ -58,6 +58,7 @@ class DcSimpleMenu
   index( { name: 1 }, { unique: true } )
 
   embeds_many :dc_simple_menu_items
+  belongs_to  :dc_site #, optional: true
   
   validates_length_of :description, minimum: 10
   
@@ -86,4 +87,39 @@ class DcSimpleMenu
   rez
 end
 
+#######################################################################
+# Will return menu structure for menus belonging to the site.
+# 
+# Parameters: 
+# [Site] DcSite document. Site for which menu belongs to. If site is not specified 
+# all current menus in collection will be returned.
+# 
+# Returns:
+# Array. Of choices prepared for tree:select input field.
+#######################################################################
+  def self.choices4_menu_as_tree(site_id=nil)
+  qry = where(active: true)
+# 
+  ar = [nil]
+  ar << (site_id.respond_to?(:id) ? site_id.id : site_id)
+  qry = qry.in(dc_site_id: ar)
+#
+  result = []
+  qry.each do |menu|
+    result << [menu.name, menu.id, nil,0]
+    menu.dc_simple_menu_items.order_by(order: 1).each do |item|
+      result << [item.caption, item.id, menu.id, item.order]
+    end
+  end
+  result
+end
+
+#######################################################################
+# Will update link value of selected menu_item.
+# 
+# Do nothing. The method is defined only for compatibility.
+#######################################################################
+def self.update_menu_item_link(path, link)
+end
+
 end

data/app/models/dc_site.rb

@@ -21,77 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-#########################################################################
-# ActiveSupport::Concern definition for DcSite class. 
-#########################################################################
-module DcSiteConcern
-extend ActiveSupport::Concern
-included do
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  
-  field :name,                type: String
-  field :description,         type: String
-  field :homepage_link,       type: String
-  field :error_link,          type: String
-  field :header,              type: String, default: ''
-  field :css,                 type: String, default: ''
-  field :route_name,          type: String, default: ''
-  field :page_title,          type: String  
-  field :document_extension,  type: String  
-  field :page_table,          type: String
-  field :page_class,          type: String, default: 'DcPage'
-  field :site_layout,         type: String, default: 'content'
-  field :menu_class,          type: String, default: 'DcSimpleMenu'
-  field :request_processor,   type: String
-  field :files_directory,     type: String
-  field :logo,                type: String
-  field :active,              type: Boolean, default: true
-  field :created_by,          type: BSON::ObjectId
-  field :updated_by,          type: BSON::ObjectId  
-  field :menu_name,           type: String
-  field :settings,            type: String
-  field :alias_for,           type: String  
-  field :rails_view,          type: String,  default: ''
-  field :design,              type: String,  default: ''
-  
-  embeds_many :dc_policies
-  embeds_many :dc_parts
-  
-  index( { name: 1 }, { unique: true } )
-  
-  validates :name, presence: true
-  validates :name, uniqueness: true      
-
-########################################################################
-# Returns value of site setting. If no value is send as parameter it returns 
-# all settings hash object.
-########################################################################
-def params(what=nil)
-  @params ||= self.settings.to_s.size > 5 ? YAML.load(self.settings) : {}
-  what.nil? ? @params : @params[what.to_s]
-end
-
-########################################################################
-# Return choices for select for site_id
-########################################################################
-def self.choices4_site
-  all.inject([]) { |r,site| r << [ (site.active ? '' : t('drgcms.disabled') ) + site.name, site._id] }
-end
-
-########################################################################
-# Return choices for selecting policies for the site
-########################################################################
-def self.choices4_policies
-  site = ApplicationController.dc_get_site_()
-  #all.inject([]) { |r,site| r << [ (site.active ? '' : t('drgcms.disabled') ) + site.name, site._id] }
-  [['a','b']]
-end
-
-end  
-end
-
-
 ######################################################################
 # == Schema information
 #
@@ -123,6 +52,7 @@ end
 #  alias_for            String               Is alias name for entered site name
 #  rails_view           String               Rails view filename used as standard design
 #  design               String               Standard design can also be defined at the site level
+#  inherit_policy       BSON::ObjectId       Use policy from other site
 #  dc_policies          Embedded:DcPolicy    Access policies defined for the site
 #  dc_parts             Embedded:DcPart      Parts contained in site
 #