drg_cms 0.5.8 → 0.5.8.2

data/app/models/dc_poll_item.rb

@@ -22,7 +22,22 @@
 #++
 
 ########################################################################
-# Mongoid::Document model for dc_poll_item embedded documents.
+# == Schema information
+#
+# Collection name: dc_poll_item : Poll items
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  name                 String               Name (alias) of returned field name
+#  text                 String               Caption of item
+#  type                 String               Input item type
+#  size                 String               size
+#  mandatory            Mongoid::Boolean     Item entry is mandatory
+#  separator            String               Separator between items
+#  options              String               Options for the item. Depends on item type.
+#  order                Integer              Order of item on poll
+#  active               Mongoid::Boolean     Item is active
 # 
 # DcPollItems define entry fields on poll questionary and formulars.
 ########################################################################

data/app/models/dc_simple_menu.rb

@@ -22,7 +22,22 @@
 #++
 
 #########################################################################
-# Mongoid::Document model for dc_simple_menus collection. 
+# == Schema information
+#
+# Collection name: dc_simple_menu : Simple menus
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  name                 String               Menu name
+#  description          String               Short description of menu
+#  div_name             String               Div id name around menu area
+#  link_prepend         String               Link field usually holds direct link to document. Prepand field holds data, that has to be prepanded to the link.
+#  css                  String               CSS for this menu
+#  active               Mongoid::Boolean     Active
+#  created_by           BSON::ObjectId       created_by
+#  updated_by           BSON::ObjectId       updated_by
+#  dc_simple_menu_items Embedded:DcSimpleMenuItem Menu items
 # 
 # Simple menus were first menu system developed for DRG CMS. They can be only two menu 
 # levels deep. Menus are described in dc_simple_menu_items embedded documents.

data/app/models/dc_simple_menu_item.rb

@@ -22,7 +22,23 @@
 #++
 
 ########################################################################
-# Mongoid::Document model for dc_simple_menu_items embedded documents. 
+# == Schema information
+#
+# Collection name: dc_simple_menu_item : drgCMS Simple menu items
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  caption              String               Caption of menu
+#  picture              String               Picture for the menu
+#  link                 String               Link called when menu is chosen
+#  link_prepend         String               Link field usually holds direct link to document. Prepand field holds data, that has to be prepanded to the link.
+#  target               String               Target window for the link. Leave empty when same window.
+#  order                Integer              Order on which menu item is shown. Lower number means prior position.
+#  submenu              String               Submenu captions in form (caption\link).
+#  policy_id            BSON::ObjectId       Menu item will be diplayed according to this policy
+#  css                  String               CSS only for this menu item
+#  active               Mongoid::Boolean     Is active
 # 
 # DcMenuItem documents are embedded in the DcSimpleMenu document and define top
 # level item of menu system. Submenus are simply defined as YAML text in the submenu field.

data/app/models/dc_site.rb

@@ -45,7 +45,6 @@ included do
   field :menu_class,          type: String, default: 'DcSimpleMenu'
   field :files_directory,     type: String
   field :logo,                type: String
-  field :guest_access,        type: Integer, default: 0
   field :active,              type: Boolean, default: true
   field :created_by,          type: BSON::ObjectId
   field :updated_by,          type: BSON::ObjectId  
@@ -62,7 +61,16 @@ included do
   
   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
 ########################################################################
@@ -79,23 +87,45 @@ def self.choices4_policies
   [['a','b']]
 end
 
-########################################################################
-# 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
-
 end  
 end
 
 
 ######################################################################
-# Mongoid::Document model for dc_sites collection.
+# == Schema information
+#
+# Collection name: dc_site : Sites
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  name                 String               Name of the site eg. www.mysite.com
+#  description          String               Short description of site
+#  homepage_link        String               Shortcut link when just site name is in the url
+#  error_link           String               Link to error page
+#  header               String               Additional data used in page html header
+#  css                  String               Site wide CSS
+#  route_name           String               Default route name for creating page link. ex. page. Leave blank if not used.
+#  page_title           String               Default page title displayed in browser's top menu when title can not be extracted from document
+#  document_extension   String               Default document extension eg. html
+#  page_table           String               Name of table holding data for pages
+#  page_class           String               Rails model class name which defines table holding pages data usually DcPage
+#  site_layout          String               Rails layout used to draw response. This is by default content layout.
+#  menu_class           String               Rails model class name which defines table holding menu data usually DcMenu
+#  files_directory      String               Directory name where uploaded files are located
+#  logo                 String               Logotype picture for the site
+#  active               Mongoid::Boolean     Is the site active
+#  created_by           BSON::ObjectId       created_by
+#  updated_by           BSON::ObjectId       updated_by
+#  menu_name            String               Menu name for this site
+#  settings             String               Various site settings
+#  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
+#  dc_policies          Embedded:DcPolicy    Access policies defined for the site
+#  dc_parts             Embedded:DcPart      Parts contained in site
 # 
-# Since DRG CMS can handle multiple sites on single ROR instance, every document
+# dc_Since DRG CMS can handle multiple sites on single ROR instance, every document
 # in dc_sites collection defines data which defines a site. 
 # 
 # Sites can be aliased which is very usefull in development and test environment. 

data/app/models/dc_stat.rb

@@ -22,9 +22,20 @@
 #++
 
 ########################################################################
-# Mongoid::Document model for dc_stat documents.
-# 
-# 
+# == Schema information
+#
+# Collection name: dc_stat : Experimental statistics collection. Not used.
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  key1                 String               key1
+#  key2                 String               key2
+#  key3                 String               key3
+#  value                Integer              value
+#  text1                String               text1
+#  text2                String               text2
+#  link                 String               link
 ########################################################################
 
 class DcStat #:nodoc:

data/app/models/dc_user.rb

@@ -111,7 +111,44 @@ end
 end
 
 ########################################################################
-# Mongoid::Document model for dc_user documents.
+# == Schema information
+#
+# Collection name: dc_user : Users
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  username             String               Username
+#  title                String               Title (dr, mag)
+#  first_name           String               Users first name
+#  middle_name          String               Middle name
+#  last_name            String               Users last name
+#  name                 String               Name colected from firstname, title and lastname
+#  company              String               company
+#  address              String               Home address
+#  post                 String               Post and post city
+#  country              String               Country
+#  phone                String               Phone number
+#  email                String               e-Mail address
+#  www                  String               www
+#  picture              String               Picture file name
+#  birthdate            Date                 Date of birth
+#  about                String               Short description of user
+#  last_visit           Time                 Users last visit
+#  active               Mongoid::Boolean     Account is active
+#  valid_from           Date                 Account is valid from
+#  valid_to             Date                 Account is valid until
+#  created_by           BSON::ObjectId       created_by
+#  updated_by           BSON::ObjectId       Account last updated by
+#  type                 Integer              Type of user account
+#  members              Array                Members (if type is group)
+#  signature            String               signature
+#  interests            String               interests
+#  job_occup            String               job_occup
+#  description          String               description
+#  reg_date             Date                 reg_date
+#  password_digest      String               password_digest
+#  dc_user_roles        Embedded:DcUserRole  Roles for this user
 # 
 # dc_users collection holds data about regitered users. Passwords are encrypted
 # with bcrypt gem. 

data/app/models/dc_user_role.rb

@@ -22,7 +22,19 @@
 #++
 
 ########################################################################
-# Mongoid::Document model for dc_user_role embedded documents.
+# == Schema information
+#
+# Collection name: dc_user_role : User roles
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  dc_policy_role_id    Object               User role
+#  valid_from           Date                 Role is valid from
+#  valid_to             Date                 Role is valid to
+#  active               Mongoid::Boolean     Role is active
+#  created_by           BSON::ObjectId       created_by
+#  updated_by           BSON::ObjectId       Role last updated 
 # 
 # DcUserRole documents are embedded in DcUser model and define user roles which
 # belong to user.

data/app/models/dc_visit.rb

@@ -22,7 +22,17 @@
 #++
 
 ######################################################################
-# Mongoid::Document model for dc_visit collection.
+# == Schema information
+#
+# Collection name: dc_visit : Visits
+#
+#  _id                  BSON::ObjectId       _id
+#  page_id              BSON::ObjectId       page_id
+#  user_id              BSON::ObjectId       user_id
+#  site_id              BSON::ObjectId       site_id
+#  session_id           String               session_id
+#  ip                   String               ip
+#  time                 DateTime             time
 # 
 # DcVisit documents are used to record visits to web site.
 ######################################################################

data/app/models/drgcms_form_fields.rb

@@ -114,7 +114,7 @@ end
 ####################################################################
 def ro_standard(value=nil)
   value = @record[@yaml['name']] if value.nil? and @record.respond_to?(@yaml['name']) 
-  @html << (value.to_s.size == 0 ? '' : "<table class='dc-readonly'><td>#{value}</td></table>")
+  @html << (value.blank? ? '' : "<table class='dc-readonly'><td>#{value}</td></table>")
   self
 end
 
@@ -596,9 +596,9 @@ def ro_standard
 #  
   get_choices.each do |choice|
     if choice.class == Array
-      return super(choice.first) if choice.last == value
+      return super(choice.first) if choice.last.to_s == value.to_s
     else
-      return super(choice) if choice == value
+      return super(choice) if choice.to_s == value.to_s
     end  
   end
   super('')
@@ -1147,6 +1147,13 @@ 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]
+end
 end
 
 ###########################################################################
@@ -1165,7 +1172,16 @@ end
 #        size: 100x30
 ###########################################################################
 class TextArea < DrgcmsField
-  
+
+###########################################################################
+# Return value for readonly field
+###########################################################################
+def ro_standard
+  value = @record[@yaml['name']]
+  @html << "<table class='dc-readonly'><td>#{value.gsub("\n",'<br>')}</td></table>" unless value.blank?
+  self
+end
+
 ###########################################################################
 # Render text_area field html code
 ###########################################################################

data/config/locales/drgcms_en.yml

@@ -48,17 +48,18 @@ en:
     file_manager: File manager
     edit_selected: Edit documents in selected collection
     invalid_username: Invalid username or password!
-    system_menu: CMS system tables
     menu_plus: Show alternative menu
     not_email: is not valid e-mail address!
     updated_by_other: Document was updated by other user. Please reenter your data.
     not_id: Value entered is not ID!
+    cms_main: CMS main tables
+    cms_advanced: CMS advanced
 
     edit: Edit
     show: Prikaz
     new: New
     sort: Sort
-    filter: Filter 
+    filter: Filter
     back: Back
     delete: Delete
     enable: Enable
@@ -67,13 +68,14 @@ en:
     save: Save
     save&back: Save & back
     save&close: Save & close
-    filter_on: Filter ON    
-    filter_off: Filter OFF   
+    filter_on: Filter ON
+    filter_off: Filter OFF
+    filter_set: Set filter
     maximize: Maximize
     minimize: Minimize
     reload: Reload
     error: Error!
-    errors_no: 'No. of errors:' 
+    errors_no: 'No. of errors:'
 
     created_by: Created by
     updated_by: Updated by
@@ -81,7 +83,7 @@ en:
     updated_at: Updated at
     new_record: New record
 
-    choices4_filter_operators: 'Equal:eq,Like:like'
+    choices4_filter_operators: 'Equal to:eq,Contains:like,Greater then:gt,Less then:lt'
     
     browse_collections: Browse all collections
 
@@ -93,3 +95,6 @@ en:
     dc_captcha:
       simple_message: Please write in the name of month no %{number} in a year.
 
+    filters:
+      this_site_only: Documents for currently selected site only
+

data/config/locales/drgcms_sl.yml

@@ -48,11 +48,12 @@ sl:
     file_manager: Organizator datotek
     edit_selected: 'Uredi: Izbrano tabelo'
     invalid_username: Napaka uporabnik ali geslo!
-    system_menu: CMS sistemske tabele    
     menu_plus: Malo drugačen menu
     not_email: ni veljaven e-naslov!
     updated_by_other: Dokument je spremenil drug uporabnik. Prosimo ponovite vpis podatkov.
-    not_id: Vsebina polja ni ključ ID!    
+    not_id: Vsebina polja ni ključ ID! 
+    cms_main: CMS tabele
+    cms_advanced: CMS napredne opcije    
 
     edit: Urejanje
     show: Prikaz
@@ -69,6 +70,7 @@ sl:
     save&close: Shrani in zapri
     filter_on: Vklopi filter
     filter_off: Izklopi filter
+    filter_set: Nastavi filter
     maximize: Povečaj
     minimize: Pomanjšaj
     reload: Osveži    
@@ -81,12 +83,14 @@ sl:
     updated_at: Spremenjeno
     new_record: Nov zapis
 
-    choices4_filter_operators: 'Je enak:eq,Vsebuje:like'
+    choices4_filter_operators: 'Je enak:eq,Vsebuje:like,Je večji od:gt,Je manjši od:lt'
     
-    browse_collections: Brskanje po zbirkah
+    browse_collections: Brskanje po definicijah zbirk
 
     dc_journal:
       zero_selected: Ni izbranih podatkov!
       restored: Podatki so restavrirani.
       restore: Restavriraj      
       
+    filters:
+      this_site_only: Dokumenti samo trenutnoo izbrane strani

data/config/locales/models_en.yml

@@ -479,11 +479,21 @@ en:
         value: Value
 
       dc_key_value_store:
-        tabletitle: Table used for storing all kind of values
+        tabletitle: Numbering store
 
         key: Id key
         value: Value
 
+      dc_filter:
+        tabletitle: Filters definitions for browsing tables
+        
+        dc_user_id: User name
+        table: Collection name
+        description: Description
+        filter: Filter definition
+        public: Is public
+        sort: Default sort        
+
 # help for forms #####################################################
 
     help:
@@ -830,3 +840,12 @@ en:
       dc_key_value_store:
         key: Identification key
         value: Stored value
+
+      dc_filter:
+        dc_user_id: User name when filter is for user only
+        table: Collection to which filter apply
+        description: Filter description
+        filter: Filter definition in YAML
+        public: Filter is available to all users
+        sort: Default sort when selecting filter
+