drg_cms 0.4.53 → 0.4.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2170ac5278d4127c49a981b33ffc4c7971ab2044
-  data.tar.gz: 0d227664c634c0169283c71a1cd3dde2b49a8015
+  metadata.gz: c4b763f10c4908f259ef1caac04ba0a9d3cb7259
+  data.tar.gz: 1bdca5ace9741bb16c17c817cf81ca18953105ba
 SHA512:
-  metadata.gz: dad0892b0d68cbaeed030987a03657e4b2fee598fb42f06bf961ed02a1e5b393201167c3fd391eed286270a22b791fc9a7e7aa3ec6a4ec9f1c8da958a573e990
-  data.tar.gz: c6a933b22b907d199464fe1099ec205a12800a2841c80d8c92a1f76cee167ad8f2a69db4f3382b8da843f0dd69319632799398e874038143dd8fd095cbc46495
+  metadata.gz: 1d9a8383bb7328b1c0fc21c9d7939919ba9d716ecdfede5ebadb68bb65f1fa77ccd94060daf0159cc8e57438bd42a6934035486dec24a45305f27aee12afbe00
+  data.tar.gz: 95ef2a4c9a674932ac80a8dc2dc79b2adeed17d4209c60587fbb95122e9d86b8889d8a9bdb9e0ff3553ce2c96d326b7aa784aaec1b8c83d42b2d7cf7e9427dac

data/app/assets/javascripts/drg_cms/drg_cms.js

@@ -40,7 +40,7 @@ dumpAttributes = function(obj) {
 };
 
 /*******************************************************************
- * Used for removing background from iframe element. It is of course not working.
+ * Trying to remove background from iframe element. It is not yet working.
  *******************************************************************/
 remove_background_from_iframe = function(obj) {
   var head = obj.head;
@@ -60,7 +60,41 @@ $(function() {
 */
 
 /*******************************************************************
- * Process json result from ajax call and update parts of document
+ * Process json result from ajax call and update parts of document.
+ * I invented my own protocol which is arguably good or wrong.
+ * 
+ * Protocol consists of operation and value which are returned as json by
+ * called controller. Controller will return an ajax call usually like this:
+ *    render json: {operation: value}.to_json
+ *    
+ * Operation is further divided into source and determinator which are divided by underline char.
+ *    render json: {#div_status: 'OK!'}.to_json
+ * will replace html in div="status" with value 'OK!'. Source is '#div' determinator is 'status'.
+ * 
+ * Possible operators are:
+ *  record_name: will replace value of record[name] field on a form with supplied value
+ *
+ *  msg_error: will display error message.
+ *  msg_warn: will display warning message.
+ *  msg_info: will display informational message.
+ *  
+ *  #div_divname : will replace divname with value
+ *  #div+_divname : will append value to divname
+ *  #+div_divname : will prepend value to divname
+ *  .div_classname : will replace all accurencess of classname with value
+ *  .+div_classname : will prepend value to all accurencess of classname
+ *  .div+_classname : will append value to all accurencess of classname
+ *  
+ *  url_: Will force loading of url supplied in value into same window
+ *  window_: Will force loading of url supplied in value into new window
+ *  reload_: Will reload current window
+ *  
+ *  Operations can be chained and are executed sequentialy.
+ *    render json: {'window_' => "/dokument.pdf", 'reload_' => 1}.to_json
+ *  will open /dokument.pdf in new window and reload current window.
+ *  
+ *    render json: {'record_name' => "Damjan", 'record_surname' => 'Rems'}.to_json
+ *  will replace values of two fields on the form.
  *******************************************************************/
 process_json_result = function(json) {
   var c = '';
@@ -111,7 +145,7 @@ process_json_result = function(json) {
         w.focus();        
         break;
       case 'reload':
-        location.reload();
+        location.reload(); 
         break;
       }
     }

data/app/assets/stylesheets/drg_cms/drg_cms.css

@@ -515,11 +515,9 @@ background-color: #eee;
 }
 
 .iframe_embedded {
-border:1px solid #eee;
-border-right: 0px;
+border: 1px solid #6cf;
 border-radius: 1px;
-box-shadow: 1px 1px 2px #6cf;
-background-color: white;
+box-shadow: 1px 1px 1px #6cf;
 }
 
 #iframe_edit, #iframe_cms {

data/app/controllers/cmsedit_controller.rb

@@ -209,7 +209,7 @@ def show
 end
 
 ########################################################################
-# Show is used to display menu
+# Login action. Used to login direct to CMS.
 ########################################################################
 def login #:nodoc:
 #  session[:edit_mode] = 0 if params[:id].in? %w(login logout) # show login menu

data/app/controllers/dc_common_controller.rb

@@ -30,15 +30,15 @@ layout false
 
 ########################################################################
 # This action is called on ajax autocomplete call. It checks if user has rights to
-# wiev data. 
+# view data. 
 # 
-# Url parameters:
+# URL parameters:
 # [table] Table (collection) model name in lower case indicating table which will be searched.
-# [id] Name of id key field that will be returend. Default is '_id'
+# [id] Name of id key field that will be returned. Default is '_id'
 # [input] Search data entered in input field.
 # [search] when passed without dot it defines field name on which search 
 # will be performed. When passed with dot class_method.method_name is assumed. Method name will
-# be parsed and any class with class method name can be avalueted. Class method must accept
+# be parsed and any class with class method name can be evaluated. Class method must accept
 # input parameter and return array [ [_id, value],.. ] which will be used in autocomplete field.
 # 
 # Return:
@@ -55,7 +55,7 @@ def autocomplete
   a = if params['search'].match(/\./)
     name, method = params['search'].split('.')
     table.send(method, params['input']).inject([]) do |r,v|
-      r << { label: v[1], value: v[1], id: v[0].to_s }
+      r << { label: v[0], value: v[0], id: v[1].to_s }
     end
 # simply search which will search and return field_name defined in params['search']
   else
@@ -63,6 +63,7 @@ def autocomplete
       r << { label: v[params['search']], value: v[params['search']], id: v.id.to_s }
     end
   end
+  p a
   render inline: a.to_json, formats: 'js'
 end
 
@@ -87,7 +88,7 @@ end
 ##########################################################################
 def toggle_edit_mode
   session[:edit_mode] ||= 0 
-# called directly without authorization  
+# called without logged in  
   if session[:edit_mode] < 1 
     dc_render_404 
   else
@@ -100,7 +101,7 @@ end
 # Default user login action.
 ####################################################################
 def process_login
-# Something is really wrong
+# Somebody is probably playing
   return dc_render_404 unless ( params[:record] and params[:record][:username] and params[:record][:password] )
   
   if params[:record][:password].to_s.size > 0  #password must not be empty
@@ -139,8 +140,6 @@ def login
     end
   end
 # Display login 
-#  redirect_to controller: 'poll', poll_id: 'login', return_to: params[:return_to] 
-#  redirect_to( {host: 'poll', poll_id: 'login', return_to: params[:return_to]} )
   route = params[:route] || 'poll'
   redirect_to "/#{route}?poll_id=login&return_to=#{params[:return_to]}"
 end
@@ -149,6 +148,8 @@ end
 # Action is called when restore document from journal is requested.
 ####################################################################
 def restore_from_journal
+# Only administrators can perform this operation  
+  return render(text: t('drgcms.not_authorized') )  unless dc_user_has_role('admin')
 # selected fields to hash  
   restore = params[:select].inject({}) {|r,v| r[v.first] = 0 if v.last == '1'; r}
   result = if restore.size == 0

data/app/forms/__drgcms_cms.yml

@@ -0,0 +1,28 @@
+## YAML Template for drgcms_menu1s
+---
+title: drgCMS First Top Menu
+table: drgcms1menu
+new_part:
+  form:
+    actions: 
+      1: cancle
+      2: 
+        type: submit
+        text: Create
+
+    fields:
+      1:
+        name: part_type
+        type: select
+        choices: part,drgcms1menu
+        eval: Person.all.collect {|p| [ p.name, p.id ] }
+        
+      2:
+        name: part_embedded_in
+        type: select
+        choices: Design:design,PodjetnikPage:podjetnik_page
+        
+      3:
+        name: location_id
+        type: select
+        choices: site-top,ads-top,site-right,site-bottom,&get_all_locations

data/app/forms/dc_ident.yml

@@ -1,5 +1,4 @@
 ---
-title: Additional identification
 table: dc_ident
 
 index:
@@ -31,7 +30,7 @@ form:
         size: 30
     20:
       name: value
-      type: file_select
+      type: text_field
       html:
-        size: 50
+        size: 30
   

data/app/forms/dc_link.yml

@@ -1,6 +1,5 @@
 ## YAML Template for Link
 ---
-title: Shortcut links 
 table: dc_link
 
 index:

data/app/forms/dc_menu_item.yml

@@ -1,7 +1,5 @@
 ## YAML Template for dc_simple_menu_items
 ---
-title: Menu item
-#parent_name: caption
 table: dc_menu_item
 
 index:

data/app/forms/dc_page.yml

@@ -1,6 +1,5 @@
 ## YAML Template for page
 ---
-title: Page 
 table: dc_page
 
 index:

data/app/forms/dc_part.yml

@@ -1,6 +1,5 @@
 ## YAML Template for page
 ---
-title: Part 
 table: dc_part
 
 index:
@@ -35,6 +34,11 @@ form:
         type: text_field
         html:
           size: 50
+      15:
+        name: link
+        type: text_field
+        html:
+          size: 50
       20:
         name: description
         type: text_field

data/app/forms/dc_piece.yml

@@ -1,6 +1,5 @@
 ## YAML Template for piece
 ---
-title: Piece 
 table: dc_piece
 
 index:

data/app/forms/dc_policy.yml

@@ -1,6 +1,5 @@
 ## YAML Template for Policy
 ---
-title: Policy 
 table: dc_policy
 
 index:

data/app/forms/dc_poll.yml

@@ -1,6 +1,5 @@
 ## YAML Template for Polls
 ---
-title: Polls
 table: dc_poll
 
 index:

data/app/forms/dc_simple_menu_item.yml

@@ -1,7 +1,5 @@
 ## YAML Template for dc_simple_menu_items
 ---
-title: Simple menu items
-#parent_name: description
 table: dc_simple_menu_item
 
 index:

data/app/forms/dc_user_role.yml

@@ -1,6 +1,5 @@
 ## YAML Template for drgcms_menu1s
 ---
-title: User roles
 table: dc_user_role
 
 index:

data/app/helpers/cmsedit_helper.rb

@@ -312,7 +312,7 @@ def dc_format_value(value, format=nil)
     format ||= t('date.formats.default')
     value.strftime(format)  
   else
-    value
+    value.to_s
   end
 end      
 

data/app/models/dc_site.rb

@@ -75,7 +75,7 @@ def self.choices4_policies
 end
 
 ########################################################################
-# Returns value of site setting. If no value send as parameter it returns 
+# Returns value of site setting. If no value is send as parameter it returns 
 # all settings hash object.
 ########################################################################
 def params(what=nil)

data/app/models/drgcms_form_field.rb

@@ -280,7 +280,19 @@ end
 # Implementation of multitext_autocomplete DRG CMS form field.
 # 
 # multitext_autocomplete field is complex data entry field which uses autocomplete
-# function when selecting multiple values for Array MongoDB field.
+# function when selecting multiple values for MongoDB Array field. Array typically holds
+# id's of selected documents and control typically displays value of the field name 
+# defined by search options.
+# 
+# Form options:
+# [name] field name
+# [table] Collection (table) name
+# [search] Search may consist of three parameters from which last is not required. Parameters
+# can be separated either by dot (.) or comma(,) table_name.display_field_name.(table_name_search_method)
+# table_name is name of collection, display_field_name will be used for displaying value of selected
+# document ids on screen. Optional search method can be defined when searched documents are 
+# only subset of all documents and additional query is required.
+# [html] Various html options which can be applied to input object.
 ###########################################################################
 class MultitextAutocomplete < DrgcmsField
 
@@ -302,10 +314,11 @@ end
 ###########################################################################
 def render 
 # search field name
-  if @yaml['search'].match(/\./)
-    table, search = @yaml['search'].split('.') 
-  else
-    search = @yaml['search']
+  if @yaml['search'].to_s.match(/\./)
+    table, field_name, method = @yaml['search'].split(/\.|\,/) 
+    search = method.nil? ? field_name : "#{field_name}.#{method}"
+  else # search and table name are separated
+    search = field_name = @yaml['search']
   end
 # determine table name 
   if @yaml['table']
@@ -319,9 +332,18 @@ def render
       nil
     end
   end
-  return 'Table or search field not defined!' unless (table and search)
+  unless (table and search)
+    @html << 'Table or search field not defined!' 
+    return self
+  end
 # 
   return ro_standard(table, search) if @readonly
+# TODO check if table exists    
+  collection = table.classify.constantize
+  unless @record.respond_to?(@yaml['name'])
+    @html << "Invalid field name: #{@yaml['name']}" 
+    return self
+  end
 # put field to enter search data on form
   @yaml['html'] ||= {}
   @yaml['html']['value'] = ''   # must be. Otherwise it will look into record and return error
@@ -330,8 +352,6 @@ def render
   @html << @parent.link_to(@parent.image_tag('drg_cms/add.png', class: 'dc-link-img'), '#',onclick: 'return false;') # dummy add. But it is usefull.
   @html << ' ' << @parent.text_field('record', _name, @yaml['html'])                 # text field for autocomplete
   @html << "<div id =\"record#{@yaml['name']}\">"                            # div to list active records
-# TODO check if table exists    
-  t = table.classify.constantize
 # find value for each field inside categories 
   unless @record[@yaml['name']].nil?
     @record[@yaml['name']].each do |element|
@@ -339,16 +359,16 @@ def render
 # more complicated options
 # TODO retrieve choices from big_table
       rec = if table == 'dc_big_table'
-        t.find(@yaml['name'], @parent.session)
+        collection.find(@yaml['name'], @parent.session)
       else
-        t.find(element)
+        collection.find(element)
       end
 # Related data is missing. It happends.
       @html << if rec
         link  = @parent.link_to(@parent.image_tag('drg_cms/x.png', class: 'dc-link-img'), '#',
                 onclick: "$('##{rec.id}').hide(); var v = $('#record_#{@yaml['name']}_#{rec.id}'); v.val(\"-\" + v.val());return false;")
         field = @parent.hidden_field('record', "#{@yaml['name']}_#{rec.id}", value: element)
-        "<div id=\"#{rec.id}\">#{link} #{rec[search]}<br>#{field}</div>"
+        "<div id=\"#{rec.id}\">#{link} #{rec[field_name]}<br>#{field}</div>"
       else
         '** error **'
       end
@@ -411,6 +431,23 @@ end
   
 ###########################################################################
 # Implementation of select DRG CMS form field.
+# 
+# Form options:
+# [name] field name
+# [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: dc_choices4('model_name','description_field_name','_id') # call dc_choices4 method
+#    eval: DcPolicyRole.choices4_roles # call class method choices4_roles in DcPolicyRole class definition.
+# If choices or eval is not defined choices will be provided from translation helpers. If you have
+# field status on a form choices may be provided by en.helpers.model_name.choices4_status entry of
+# english translation. English is of course default translation. If you provide translations in
+# your own language then select choices will be localized.
+#    sl.helpers.model_name.choices4_status: 'V redu:0,Pripravljen:1,Napaka:2'
+#     
+# [html] html options which can be applied to select field.
 ###########################################################################
 class Select < DrgcmsField
   
@@ -687,7 +724,7 @@ end
 # DatePicker get_data method.
 ###########################################################################
 def self.get_data(params, name)
-  t = params['record'][name].to_datetime 
+  t = params['record'][name] ? params['record'][name].to_datetime : nil
   t ? Time.zone.local(t.year, t.month, t.day) : nil
 end
 
@@ -728,7 +765,7 @@ end
 # DateTimePicker get_data method.
 ###########################################################################
 def self.get_data(params, name)
-  t = params['record'][name].to_datetime 
+  t = params['record'][name] ? params['record'][name].to_datetime : nil
   t ? Time.zone.local(t.year, t.month, t.day, t.hour, t.min) : nil
 end
 

data/config/locales/drgcms_en.yml

@@ -83,17 +83,6 @@ en:
       zero_selected: No data selected!
       restored: Data has been restored.      
       restore: Restore      
-
-    dc_mail:
-      send: Send
-      send_to_test: Send test
-      mail_sent: Mail sending procedure was started!
-      test_mail_sent: Mail send to test recipient!
-      message_status_error: Message status must be Ready to send!
-      message_sent_to: "Message sent to %{number} address(es)."
-      message_errors: "%{number} addresses were in error!"
-      report: Report
-      unsubscription: Unsubscription
       
     dc_captcha:
       simple_message: Please write in the name of month no %{number} in a year.

data/config/locales/drgcms_sl.yml

@@ -83,16 +83,4 @@ sl:
       zero_selected: Ni izbranih podatkov!
       restored: Podatki so restavrirani.
       restore: Restavriraj      
-
-    dc_mail:
-      send: Pošlji
-      send_to_test: Pošlji test
-      mail_sent: Postopek za pošiljanje sporočila je zagnan!
-      test_mail_sent: Sporočilo je bilo poslano na naslov za test!
-      message_status_error: Stanje sporočila mora biti pripravljeno!
-      message_sent_to: "Sporočilo je bilo poslano na %{number} naslov(ov)."
-      message_errors: "%{number} naslov(ov) z napakami!"
-      report: Poročilo
-      unsubscription: Odjava
-      
       

data/config/locales/models_sl.yml

@@ -810,5 +810,5 @@ sl:
         diff: Razlike
 
       dc_ident:
-        key: Ključ identifikacije
-        value: Vrednost
+        key: Ključ identifikacije (npr. DDV)
+        value: Vrednost (SI12345678)

data/lib/drg_cms/version.rb

@@ -1,4 +1,4 @@
 module DrgCms #:nodoc:
   # drg_cms gem version
-  VERSION = "0.4.53"
+  VERSION = "0.4.54"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.4.53
+  version: 0.4.54
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -156,6 +156,7 @@ files:
 - app/controllers/dc_common_controller.rb
 - app/controllers/dc_main_controller.rb
 - app/controllers/drgcms_controls/dc_page_controls.rb
+- app/forms/__drgcms_cms.yml
 - app/forms/all_options.yml
 - app/forms/cms_forms.yml
 - app/forms/cms_menu.yml
@@ -200,7 +201,6 @@ files:
 - app/helpers/dc_poll_renderer.rb
 - app/helpers/dc_renderer.rb
 - app/helpers/dc_simple_menu_renderer.rb
-- app/models/__dc_stat.rb
 - app/models/dc_ad.rb
 - app/models/dc_ad_stat.rb
 - app/models/dc_big_menu.rb

data/app/models/__dc_stat.rb

@@ -1,43 +0,0 @@
-#--
-# Copyright (c) 2012+ 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.
-#++
-
-########################################################################
-# Mongoid::Document model for dc_stat documents.
-# 
-# 
-########################################################################
-
-class DcStat #:nodoc:
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  
-  field :key1,                type: String
-  field :key2,                type: String
-  field :key3,                type: String
-  field :value,               type: Integer, default: 0
-  field :text1,               type: String
-  field :text2,               type: String
-  field :link,                type: String
-  
-  index( { key1: 1, key2: 1, key3: 1 } )
-end