drg_cms 0.6.0.8 → 0.6.1.0

data/config/locales/drgcms_sl.yml

@@ -114,3 +114,18 @@ sl:
       
     filters:
       this_site_only: Dokumenti samo trenutno izbrane strani
+
+    dc_help:
+      help: POMOČ
+      title: Urejanje dokumentov pomoči
+      project: Projekt
+      lang: Jezik
+      project_refresh: Osveži
+      project_refresh_title: Osveži seznam že pripravljenih dokumentov
+      form_name: Forma
+      updated_at: Spremenjeno
+      1basic: Osnovno
+      2index: Index
+      3form: Forma
+
+

data/config/locales/models_en.yml

@@ -94,7 +94,7 @@ en:
 
       dc_user:
         tabletitle: Users
-        tab1: Base
+        1base: Base
 
         id: Id
         username: Username
@@ -116,8 +116,8 @@ en:
         valid_from: Valid from   
         valid_to: Valid to
         updated_by: Updated by
-        type: Type
-        members: Members
+        group: Is group
+        member: Member in groups
         dc_user_roles: Roles 
         password: Password
         password_confirmation: Confirm password
@@ -620,8 +620,8 @@ en:
         valid_from: Account is valid from    
         valid_to: Account is valid until
         updated_by: Account last updated by
-        type: Type of user account
-        members: Members (if type is group)
+        group: This is group account
+        member: User is member in selected groups
         dc_user_roles: Roles for this user
         password: Password
         password_confirmation: Password confirmation

data/config/locales/models_sl.yml

@@ -86,19 +86,20 @@ sl:
 
       dc_user:
         tabletitle: Uporabniki
-        tab1: Osnova
+        1base: Osnova
 
         id: Id
         username: Uporabnik
         title: Titula
         first_name: Ime
+        middle_name: Srednje ime
         last_name: Priimek
         name: Naziv
         address: Naslov
         post: Pošta
         country: Država 
         phone: Telefon
-        email: e-Pošta
+        email: e-Naslov
         picture: Slika
         birthdate: Datum rojstva
         about: Več o
@@ -107,8 +108,8 @@ sl:
         valid_from: Velja od         
         valid_to: Velja do
         updated_by: Spremenil
-        type: Vrsta
-        members: Člani
+        group: Je skupina
+        member: Član v skupinah
         dc_user_roles: Uporabniške vloge 
         password: Geslo
         password_confirmation: Potrdi geslo
@@ -639,8 +640,8 @@ sl:
         valid_from: Začetni datum veljavnosti         
         valid_to: Končni datum veljavnosti
         updated_by: Spremenil
-        type: Vrsta uporabniškega računa
-        members: Člani (če skupina uporabnikov)
+        group: Račun predstavlja uporabniško skupino
+        member: Seznam skupin za uporabnika
         dc_user_roles: Vloge, ki pripadajo temu uporabniku 
         password: Geslo
         password_confirmation: Še enkrat vpišite geslo

data/lib/drg_cms.rb

@@ -118,6 +118,63 @@ def self.from_root(file=nil)
   File.expand_path("../../#{file}", __FILE__).to_s
 end
 
+####################################################################
+# Checks if any errors exist on document and writes error log. It can also
+# crash if requested. This is mostly usefull in development for debuging
+# model errors or when updating multiple collections and each save must be
+# checked if succesfull.
+#
+# @param [Document] Document object which will be checked
+# @param [Boolean] If true method should end in runtime error. Default = false.
+#
+# @return [String] Error messages or empty string if everything is OK.
+#
+# @Example Check for error when data is saved.
+#   model.save
+#   if (msg = DrgCms.model_check(model) ).size > 0
+#     p msg
+#     error process ......
+#   end
+#
+####################################################################
+def self.model_check(document, crash = false)
+  return nil unless document.errors.any?
+
+  msg = ""
+  document.errors.each do |attribute, errors_array|
+    msg << "#{attribute}: #{errors_array}\n"
+  end
+  #
+  if crash and msg.size > 0
+    msg = "Validation errors in #{document.class}:\n" + msg
+    pp msg
+    Rails.logger.error(msg)
+    raise "Validation error. See log for more information."
+  end
+  msg
+end
+
+####################################################################
+# Clear cache. If key is specified only this key will be deleted.
+#
+# @param [String] Optional key to be deleted
+####################################################################
+def self.cache_clear(key = nil)
+  return Rails.cache.clear if key.nil?
+
+  if ((Rails.application.config.cache_store.first == :redis_cache_store) rescue false)
+    Rails.cache.redis.del(key)
+  else
+    Rails.cache.delete_matched("#{key}*")
+  end
+end
+
+def self.__cache_clear(key = nil)
+  return Rails.cache.clear if key.nil?
+
+  Rails.cache.delete_matched("#{key}*")
+end
+
 ###############################################################################
 # All Routes required by DrgCms. 
 # 
@@ -138,6 +195,7 @@ def self.routes
       match 'dc_common/paste_clipboard' => :paste_clipboard, via: [:get, :post]
       put 'dc_common/restore_from_journal'  => :restore_from_journal
       get 'dc_common/add_json_ld_schema'    => :add_json_ld_schema
+      get 'dc_common/help' => :help
     end
     match 'elfinder' => 'dc_elfinder#connector', via: [:get, :post]
     match 'cmsedit/run' => 'cmsedit#run', via: [:get, :put, :post]

data/lib/drg_cms/version.rb

@@ -23,5 +23,5 @@
 
 # drg_cms gem version
 module DrgCms #:nodoc:
-  VERSION = '0.6.0.8'.freeze
+  VERSION = '0.6.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.0.8
+  version: 0.6.1.0
 platform: ruby
 authors:
 - Damjan Rems
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-20 00:00:00.000000000 Z
+date: 2021-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -210,6 +210,7 @@ files:
 - app/controllers/dc_common_controller.rb
 - app/controllers/dc_main_controller.rb
 - app/controls/browse_models_control.rb
+- app/controls/dc_help_control.rb
 - app/controls/dc_page_control.rb
 - app/controls/dc_poll_result_control.rb
 - app/controls/dc_report.rb
@@ -228,6 +229,7 @@ files:
 - app/forms/dc_filter.yml
 - app/forms/dc_folder_permission.yml
 - app/forms/dc_gallery.yml
+- app/forms/dc_help_1.yml
 - app/forms/dc_ident.yml
 - app/forms/dc_journal.yml
 - app/forms/dc_json_ld.yml
@@ -262,7 +264,6 @@ files:
 - app/helpers/cms_helper.rb
 - app/helpers/cms_index_helper.rb
 - app/helpers/dc_application_helper.rb
-- app/models/__dc_dummy.rb
 - app/models/concerns/dc_page_concern.rb
 - app/models/concerns/dc_piece_concern.rb
 - app/models/concerns/dc_policy_rule_concern.rb
@@ -361,6 +362,7 @@ files:
 - app/views/cmsedit/index.html.erb
 - app/views/cmsedit/login.html.erb
 - app/views/cmsedit/new.html.erb
+- app/views/dc_common/_help.html.erb
 - app/views/dc_common/_iframe_edit.html.erb
 - app/views/dc_common/paste_clipboard.html.erb
 - app/views/layouts/__cmsedit.html.erb

data/app/models/__dc_dummy.rb

@@ -1,102 +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.
-#++
-
-########################################################################
-# == Schema information
-#
-# Collection name: dc_dummy : Collection name used when form does not belong to database model.
-#
-#  _id                  BSON::ObjectId       _id 
-# 
-# Which is not collection at all. DcDummy model is used for entering data on forms 
-# where data will not be saved to database but will instead be processed by custom 
-# made routine. For example entering begin and end date on report.
-# 
-# Example (as used in forms):
-# 
-#    table: dc_dummy
-#    title: Enter time period
-#
-#      form:
-#        actions:
-#          1:
-#            type: ajax
-#            method: post
-#            controller: reports
-#            action: do_some_report
-#            caption: Run report
-#
-#        fields:
-#          10:
-#            name: date_start
-#            type: date_picker
-#            caption: Start date
-#          20:
-#            name: date_end
-#            type: date_picker
-#            caption: End date
-#            
-# And suppose your report saved data to file named public/report.pdf. 
-# Put this line at the end of do_some_report method:
-# 
-#    render inline: { :window_report => '/report.pdf' }.to_json, formats: 'js'
-#    
-# As result report.pdf file will be opened in new browser window.
-########################################################################
-class DcDummy
-  include Mongoid::Document
-  
-########################################################################
-# Respond_to should always return true.
-########################################################################
-def respond_to?(m)
-  true
-end
-
-########################################################################
-# Redefine send method. Send is used to assign value by cmsedit controller.
-########################################################################
-def send(field,value=nil)
-  if field.to_s.match('=')
-    field.chomp!('=')
-    @internals ||= {}
-    @internals[field] = value
-  end
-end
-  
-########################################################################
-# Method missing will return value if value defined by m parameter is saved to
-# @internals array or will assign new value to @internals hash if m matches '='.
-########################################################################
-def method_missing(m, *args, &block) #:nodoc:
-  @internals ||= {}
-  m = m.to_s
-  if m.match('=')
-    m.chomp!('=')
-    @internals[m] = args.first
-  else
-    @internals[m]
-  end   
-end
-
-end