drg_cms 0.5.52.12 → 0.5.52.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 637c9ceaf9353fced28bc05ec02a3ad516d91f54
-  data.tar.gz: 949139ee0f5a5351741e94d74d5e7e1502426946
+SHA256:
+  metadata.gz: 4830c6ed53c032e56282ba2b6b2b2e3a3c98630e45ee6a96a3d1f03531081738
+  data.tar.gz: e9bf50040f3dce41deb7b97b4927a58aace756a4060cdfe64e6424188cdb66ae
 SHA512:
-  metadata.gz: c67a0b1046125b1408fa8604b88d5b9993d29832fbe6daac9d829b4f6c2bb7537049da1636eefd5f5d3aaebdc84e3ef0ed5f9dd9abb56d039a857b509367573c
-  data.tar.gz: 44e2b256013e943de0edb9e96a947e4deebca64a24686809b2b70ed4d1d9edb827aafb0a300473dbfde0888f6044108150eeb84517ca822529f4b69773083499
+  metadata.gz: e5f93f0426f8cda2ff394d3233372cd056dbcd0cd140507d392b7db47e68ba57cf47e1f4696ae2da9c4ff2b9ea3331e186750fd88a07221bc0557056c4c47c4d
+  data.tar.gz: 2cd13d6c58e907e6d2133681387d9bb760e5a5a57e34ad25d694737f86cb5fc7ecc74e60adbf12a67e7e1cb3dfe8b23dc35e1463f5e22ce71beb9b5055080424

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

@@ -322,7 +322,7 @@ $(document).ready( function() {
   $('#iframe_cms').load( function() {
 //    alert('bla 1');
     new_height = this.contentWindow.document.body.offsetHeight + 50;
-    if (new_height < 500 & new_height > 60) new_height = 500;
+    if (new_height < 500 && new_height > 60) new_height = 500;
     this.style.height = new_height + 'px'; 
 // scroll to top
     $('#iframe_cms').dc_scroll_view();
@@ -346,7 +346,7 @@ $(document).ready( function() {
  *******************************************************************/
   $('.dc-link-ajax').on('click', function(e) {
 // check HTML5 validations
-    if (!$("form")[0].checkValidity() ) {
+    if ($("form")[0] && !$("form")[0].checkValidity() ) {
       $("form")[0].reportValidity();
       return false;
     }
@@ -381,6 +381,21 @@ $(document).ready( function() {
       }
       
     });  
+  }); 
+    
+/*******************************************************************
+  will open a new window with URL specified. 
+********************************************************************/
+  $('.dc-window-open').on('click', function(e) { 
+    var url   = this.getAttribute("data-url");
+    var title = this.getAttribute("title");
+    var w     = 1000;
+    var h     = 800;
+    var left  = (screen.width/2)-(w/2);
+    var top   = (screen.height/2)-(h/2);
+    var win   = window.open(url, title, 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=no, copyhistory=no, width='+w+', height='+h+', top='+top+', left='+left);
+    win.focus();
+//    $('#bpopup').bPopup({ loadUrl: url, speed: 650, transition: 'slideDown' });  
   });  
 
  /*******************************************************************

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

@@ -93,6 +93,7 @@ padding: 6px 4px;
 border: solid 2px #ddd;
 border-radius: 2px;
 font: 14px helvetica;
+max-width: 100%;
 }
 
 textarea:focus, input:focus, select:focus {
@@ -270,9 +271,10 @@ display: inline-table;
 #data-fields {margin: 5px;}
 
 .dc-link {
-padding: 6px; 
-
+font-weight: bold;
+color: #666;
 text-align: center;
+padding: 6px; 
 border-radius: 2px;
 background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat scroll 0% 0%;
 border: 1px solid #eee;
@@ -281,7 +283,9 @@ border: 1px solid #eee;
 .dc-link:hover {
   background: #ddd;
   border: 1px solid #ddd;
-  transition: 0.3s;  
+  transition: 0.3s; 
+  color: #000;
+  cursor: pointer;
 }
 
 .dc-link:hover a { 
@@ -289,6 +293,15 @@ border: 1px solid #eee;
   transition: 0.3s;  
 }
 
+.dc-link-no {
+  text-align: left;
+  font-weight: bold;
+  padding: 6px;  
+  border-radius: 2px;
+  color: #fff;
+  background: #ddd;
+}
+
 .dc-link-ajax {
   text-align: left;
   font-weight: bold;

data/app/assets/stylesheets/drg_cms/select-multiple.css

@@ -1,5 +1,5 @@
 .ms-container{
-  width: 200px;
+  max-width: 200px;
 }
 
 .ms-container:after{

data/app/controllers/cmsedit_controller.rb

@@ -207,18 +207,17 @@ def check_filter_options() #:nodoc:
 =end  
 # pagination if required
   per_page = (@form['result_set']['per_page'] || 30).to_i
-  if per_page > 0
-    @records = @records.page(session[table_name][:page]).per(per_page)
-  end
+  @records = @records.page(session[table_name][:page]).per(per_page) if per_page > 0
 end
 
 ########################################################################
-# Index action.
+# Process index action for normal collections.
 ########################################################################
-def index
+def process_collections #:nodoc
 # If result_set is not defined on form, then it will fail. :return_to should know where to go
   if @form['result_set'].nil?
-    return process_return_to(params[:return_to] || 'reload') 
+    process_return_to(params[:return_to] || 'reload') 
+    return true
   end
 # for now enable only filtering of top level documents
   if @tables.size == 1 
@@ -232,7 +231,8 @@ def index
 # something iz wrong. flash[] should have explanation.
       if @records.class == FalseClass
         @records = []
-        return render(action: :index)
+        render(action: :index)
+        return true
       end
 # pagination but only if not already set
       unless (@form['table'] == 'dc_memory' or @records.options[:limit])
@@ -253,8 +253,35 @@ def index
       end
     end
   end
-#
-  call_callback_method('dc_footer')
+  false
+end
+
+########################################################################
+# Process index action for in memory data.
+########################################################################
+def process_in_memory #:nodoc
+  @records = []
+  # result set is defined by filter method in control object
+  if (method = @form['result_set']['filter'])
+    send(method) if respond_to?(method)    
+  end
+  # result set is defined by class method
+  if (klass_method = @form['result_set']['filter_method'])
+    _klass, method = klass_method.split('.')
+    klass = _klass.classify.constantize
+    @records = klass.send(method) if klass.respond_to?(method)
+  end 
+  false
+end
+
+########################################################################
+# Indx action 
+########################################################################
+def index
+  redirected = (@form['table'] == 'dc_memory' ? process_in_memory : process_collections)
+  return if redirected
+#  
+  call_callback_method(@form['result_set']['footer'] || 'dc_footer')
   respond_to do |format|
     format.html { render action:  :index }
     format.js   { render partial: :result }
@@ -471,7 +498,9 @@ def update
       params[:return_to] = 'index' if params[:commit] == t('drgcms.save&back') # save & back
       @parms['action'] = 'update'
 # Process return_to link
-      return process_return_to(params[:return_to]) if params[:return_to]      
+      return process_return_to(params[:return_to]) if params[:return_to]
+    else
+      return render action: :edit
     end
   else
     flash[:error] = t('drgcms.not_authorized')
@@ -505,6 +534,7 @@ def destroy
   when !ok2delete then
     flash[:error] = t('drgcms.not_authorized')
     return index
+    
   when params['operation'].nil? then
 # Process before delete callback
     if (m = callback_method('before_delete') )
@@ -517,13 +547,18 @@ def destroy
       save_journal(:delete)
       flash[:info] = t('drgcms.record_deleted')
 # Process after delete callback
-      if (m = callback_method('after_delete') ) then call_callback_method(m) end
+      if (m = callback_method('after_delete') ) 
+        call_callback_method(m)
+      elsif params['after-delete'].to_s.match('return_to')
+        params[:return_to] = params['after-delete']
+      end
 # Process return_to link
       return process_return_to(params[:return_to]) if params[:return_to]
     else
       flash[:error] = dc_error_messages_for(@record)
     end
     return index
+    
 # deaktivate document    
   when params['operation'] == 'disable' then
     if @record.respond_to?('active')
@@ -533,6 +568,7 @@ def destroy
       @record.save
       flash[:info] = t('drgcms.doc_disabled')
     end
+    
 # reaktivate document
   when params['operation'] == 'enable' then
     if @record.respond_to?('active')
@@ -542,6 +578,10 @@ def destroy
       @record.save
       flash[:info] = t('drgcms.doc_enabled')
     end
+
+# reorder documents
+  when params['operation'] == 'reorder' then
+
   end
 #
   @parms['action'] = 'update'
@@ -588,8 +628,7 @@ def read_drg_cms_form
 # split ids passed when embedded document
   ids = params[:ids].to_s.strip.downcase
   @ids = ids.split(';').inject([]) { |r,v| r << v }
-# formname defaults to last table specified
-  dc_deprecate("Parameter :formname will be deprecated in future. Use :form_name instead") if params[:formname]
+# form_name defaults to last table specified
   form_name = params[:form_name] || @tables.last[1]
   @form  = YAML.load_file( dc_find_form_file(form_name) ) rescue nil
   return unless @form
@@ -621,9 +660,10 @@ def check_authorization
 # Just show menu
 #  return show if params[:action] == 'show'
   return login if params[:id].in?(%w(login logout))
+  table = params[:table].to_s.strip.downcase
 # request shouldn't pass
-  if session[:user_roles].nil? or params[:table].to_s.strip.downcase.size < 3 or 
-     !dc_user_can(DcPermission::CAN_VIEW)
+  if table != 'dc_memory' and 
+     (session[:user_roles].nil? or table.size < 3 or !dc_user_can(DcPermission::CAN_VIEW))
     return render(action: 'error', locals: { error: t('drgcms.not_authorized')} )
   end
 
@@ -729,7 +769,7 @@ def callback_method(key) #:nodoc:
     when params['data'] && params['data'][data_key] then params['data'][data_key]
 # if dc_ + key method is present in model then it will be called automatically     
     when respond_to?('dc_' + key) then 'dc_' + key
-    when params[key] then params[key]
+    when params[data_key] then params[data_key]
     else nil
   end
 #  

data/app/controllers/dc_application_controller.rb

@@ -206,12 +206,20 @@ def dc_user_can(permission, table=params[:table])
 end  
 
 ####################################################################
-# Detects if called from mobile agent according to http://detectmobilebrowsers.com/
+# Detects if called from mobile agent according to http://detectmobilebrowsers.com/ 
+# and set session[:is_mobile]
+# 
+# Detect also if caller is a robot and set session[:is_robot]
 ####################################################################
 def dc_set_is_mobile
   is_mobile = request.user_agent ? /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.match(request.user_agent) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.match(request.user_agent[0..3])
                                  : false
   session[:is_mobile] = is_mobile ? 1 : 0
+#
+  if request.env["HTTP_USER_AGENT"] and request.env["HTTP_USER_AGENT"].match(/\(.*https?:\/\/.*\)/)
+    logger.info "ROBOT: #{Time.now.strftime('%Y.%m.%d %H:%M:%S')} id=#{@page.id} ip=#{request.remote_ip}."
+    session[:is_robot] = true
+  end
 end
 
 
@@ -576,4 +584,78 @@ def dc_deprecate(msg)
   ActiveSupport::Deprecation.warn("#{dc_get_site.name}: #{msg}")
 end
 
+####################################################################
+# Clears all session data related to login. 
+####################################################################
+def clear_login_data
+  session[:edit_mode]   = 0
+  session[:user_id]     = nil
+  session[:user_name]   = nil
+  session[:user_roles]  = nil
+  cookies.delete :remember_me
+end
+
+####################################################################
+# Fills session with data related to successful login.
+# 
+# @param [DcUser] user : User's document
+# @param [Boolean] remember_me : false by default
+####################################################################
+def fill_login_data(user, remember_me=false)
+  session[:user_id]    = user.id if user
+  session[:user_name]  = user.name if user
+  session[:edit_mode]  = 0 
+  session[:user_roles] = []
+  # Every user has guest role
+  guest = DcPolicyRole.find_by(system_name: 'guest')
+  session[:user_roles] << guest.id if guest
+  return unless user and user.active  
+  # special for SUPERADMIN
+  sa = DcPolicyRole.find_by(system_name: 'superadmin')
+  if sa and (role = user.dc_user_roles.find_by(dc_policy_role_id: sa.id))
+    session[:user_roles] << role.dc_policy_role_id
+    session[:edit_mode]  = 2
+    return
+  end
+  # read default policy from site. Policy might be inherited
+  policy_site = dc_get_site()
+  policy_site = DcSite.find(policy_site.inherit_policy) if policy_site.inherit_policy
+  default_policy = policy_site.dc_policies.find_by(is_default: true)
+  # load user roles      
+  user.dc_user_roles.each do |role|
+    next unless role.active
+    next if role.valid_from and role.valid_from > Time.now.end_of_day.to_date
+    next if role.valid_to   and role.valid_to < Time.now.to_date
+    # check if role is active in this site
+    policy_role = default_policy.dc_policy_rules.find_by(dc_policy_role_id: role.dc_policy_role_id)
+    next unless policy_role
+    # set edit_mode      
+    session[:edit_mode] = 1 if policy_role.permission > 1
+    session[:user_roles] << role.dc_policy_role_id
+  end
+  # Save remember me cookie if not CMS user and remember me is selected
+  if session[:edit_mode] == 0 and remember_me
+    cookies.signed[:remember_me] = { :value => user.id, :expires => 180.days.from_now}
+  end
+end
+
+##########################################################################
+# Will check if user's login data is stil valid and reload user roles.
+# 
+# @param [Time] repeat_after : Check is repeated after time. This is by default performed every 24 hours.
+##########################################################################
+def dc_check_user_still_valid(repeat_after=1.day)
+  # not needed
+  return if session[:user_id].nil? 
+  # last check more than a day ago
+  if (session[:user_chk] ||= Time.now) < repeat_after.ago
+    user_id = session[:user_id]
+    clear_login_data
+    # reload user roles
+    user = DcUser.find( user_id ) rescue nil
+    fill_login_data(user)
+    session[:user_chk] = Time.now
+  end  
+end
+
 end

data/app/controllers/dc_common_controller.rb

@@ -105,7 +105,7 @@ def process_login
   return dc_render_404 unless ( params[:record] and params[:record][:username] and params[:record][:password] )
 
   unless params[:record][:password].blank? #password must not be empty
-    user  = DcUser.find_by(username: params[:record][:username])
+    user  = DcUser.find_by(username: params[:record][:username], active: true)
     if user and user.authenticate(params[:record][:password])
       fill_login_data(user, params[:record][:remember_me].to_i == 1)
       return redirect_to params[:return_to] ||  '/'
@@ -130,7 +130,7 @@ end
 def login
   if cookies.signed[:remember_me]
     user = DcUser.find(cookies.signed[:remember_me])
-    if user
+    if user and user.active
       fill_login_data(user, true)
       return redirect_to params[:return_to]
 
@@ -282,54 +282,4 @@ def process_document(line, table, id, ids)
   msg ? " ERROR! #{msg}" : " NEW. OK." 
 end
 
-####################################################################
-# Clears all session data related to login. 
-####################################################################
-def clear_login_data
-  session[:edit_mode]   = 0
-  session[:user_id]     = nil
-  session[:user_name]   = nil
-  session[:user_roles]  = nil
-  cookies.delete :remember_me
-end
-
-####################################################################
-# Fills session with data related to successful login.
-####################################################################
-def fill_login_data(user, remember_me)
-  session[:user_id]    = user.id
-  session[:user_name]  = user.name
-  session[:edit_mode]  = 0 
-  session[:user_roles] = []
-  
-# special for SUPERADMIN
-  sa = DcPolicyRole.find_by(system_name: 'superadmin')
-  if sa and (role = user.dc_user_roles.find_by(dc_policy_role_id: sa.id))
-    session[:user_roles] << role.dc_policy_role_id
-    session[:edit_mode]  = 2
-    return
-  end
-# Every user has guest role
-  guest = DcPolicyRole.find_by(system_name: 'guest')
-  session[:user_roles] << guest.id if guest
-# read default policy from site  
-  default_policy = dc_get_site().dc_policies.find_by(is_default: true)
-# load user roles      
-  user.dc_user_roles.each do |role|
-    next unless role.active
-    next if role.valid_from and role.valid_from > Time.now.end_of_day.to_date
-    next if role.valid_to   and role.valid_to < Time.now.to_date
-# check if role is active in this site
-    policy_role = default_policy.dc_policy_rules.find_by(dc_policy_role_id: role.dc_policy_role_id)
-    next unless policy_role
-# set edit_mode      
-    session[:edit_mode] = 1 if policy_role.permission > 1
-    session[:user_roles] << role.dc_policy_role_id
-  end
-# Save remember me cookie if not CMS user and remember me is selected
-  if session[:edit_mode] == 0 and remember_me
-    cookies.signed[:remember_me] = { :value => user.id, :expires => 180.days.from_now}
-  end
-end
-
 end

data/app/forms/all_options.yml

@@ -27,6 +27,9 @@ index:
       url: some_url
       caption: Some caption
       title: Text for mouse over
+      html:
+        class: dc-link-spinner
+        data-confirm: Confirm dialog text.
 
     3: 
       type: link
@@ -41,6 +44,7 @@ index:
 
 result_set:
   filter: custom_filter
+  footer: custom_footer
   actions_width: 100
   per_page: 10
   table_style: 'color: green;'
@@ -109,17 +113,36 @@ form:
   actions: 
     5: 
       type: ajax
-      controller: ppk
-      action: priprava_odlocbe
+      controller: ctrl
+      action: action
       method: (get),put,post
-      caption: Priprava odločbe
+      caption: ajax_call
+      when_new: false
+    5: 
+      type: window
+      controller: cmsedit
+      form_name: form
+      table: table
+      action: edit
+      method: (get),put,post
+      caption: Edit linked document
+      when_new: false
+      params:
+        id:
+          object: record (can be omitted)
+          method: page_id
+        user:
+          object: session
+          method: user_id          
+      
     6: 
       type: script
       caption: Cancle 
-      js: parent.reload();
+      js: parent.location.reload();
     7:
       type: submit
       caption: Send
+      when_new: false
       params:
         before-save: send_mail
         after-save: return_to parent.reload