drg_cms 0.6.0.6 → 0.6.0.8

data/config/locales/models_sl.yml

@@ -129,8 +129,9 @@ sl:
         choices4_operation: 'Poženi program:poll_submit,Povezava:link'
         choices4_display: 'Zgoraj:td,Levo:lr,Znotraj:in'
         tab1: Podatki
-        tab2: Forma
-        tab3: Vrstice
+        tab2: Skriptna koda
+        tab3: Vsebina
+        tab4: Vsebina - napredno
 
         name: Ime
         title: Naslov
@@ -139,6 +140,8 @@ sl:
         parameters: Parametri
         display: Napis
         css: CSS
+        js: Skriptna koda
+        pre_display: Pred prikazom zaženi
         valid_from: Velja od
         valid_to: Velja do
         dc_poll_items: Vrstice
@@ -148,7 +151,7 @@ sl:
 
       dc_poll_item:
         tabletitle: Vnosne vrstice
-        choices4_type: Podatek:text_field,Tekst:text_area,Izbirno:select,Izbirni gumb:check_box,Zaključek:submit_tag,Povezava:link_to,Geslo:password_field,Komentar:comment
+        choices4_type: Podatek:text_field,Tekst:text_area,Izbirno:select,Izbirni gumb:check_box,Zaključek:submit_tag,Povezava:link_to,Geslo:password_field,Komentar:comment,Radio:radio
         choices4_separator: Presledek:&nbsp;,Prazna vrstica:<br />,Ravnilo:<hr>
 
         name: Naziv
@@ -167,6 +170,7 @@ sl:
         dc_poll_id: Anketa
         created_at: Nastalo
         data: Podatki
+        confirmed: Potrjen
 
       dc_policy:
         tabletitle: Politike za dostop
@@ -658,6 +662,8 @@ sl:
         parameters: Dodatni parametri za operacijo
         display: Postavitev napisa glede na vpisno polje
         css: CSS samo za to anketo
+        js: Javascript koda samo za to anketo
+        pre_display: Metoda. ki se zažene pred prikazom obrazca. Običajno za privzeto polnjenje podatkov obrazca
         valid_from: Anketa je veljavna od
         valid_to: Anketa je veljavna do
         dc_poll_items: Posamezni podatki ankete
@@ -679,6 +685,7 @@ sl:
         dc_poll_id: Naziv ankete
         created_at: Čas nastanka zapisa
         data: Podatki v YAML formatu
+        confirmed: Podatki potrjeni. Npr. Uporabnik mora klikniti povezavo v e-pošti.
 
       dc_policy:
         name: Naziv politike

data/lib/drg_cms/version.rb

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

data/lib/generators/new_drg_form/new_drg_form_generator.rb

@@ -14,11 +14,13 @@ def create_form_file
   form_name = file_name #if formname.size == 0
   begin
     @model = file_name.classify.constantize
-  rescue e
-    logger.error ([e.message]+e.backtrace).join($/)
+  rescue Exception => e
+    msg = ([e.message]+e.backtrace).join($/)
+    Rails.logger.error(msg)
+    pp msg
     @model = nil
   end
-  return (p "Error loading #{file_name.classify} model! Aborting.") if @model.nil?
+  return (pp "Error loading #{file_name.classify} model! Aborting.") if @model.nil?
 #  
   yml = top_level_options + index_options + result_set_options + form_top_options + form_fields_options + localize_options
   create_file "app/forms/#{form_name}.yml", yml

data/lib/tasks/database.rake

@@ -6,61 +6,9 @@
 #########################################################################
 def determine_model(path)
   path =~ /(.*)\/(.*).rb/
-  begin
-    $2.camelize.constantize 
-  rescue Exception # it happends
-    nil
-  end
+  $2.camelize.constantize rescue nil # nil happens
 end
 
-#########################################################################
-# Create index for single module
-#########################################################################
-def create_index(model)
-  return if model.index_specifications.empty?
-#
-  if !model.embedded? || model.cyclic?
-    @logger.info("DRGCMS: Creating indexes on #{model}:")
-    model.create_indexes
-    model.index_specifications.each do |spec|
-      @logger.info("DRGCMS: Index: #{spec.key}, Options: #{spec.options}")
-    end
-    model
-  else
-    @logger.info("DRGCMS: Index ignored on: #{model}, please define in the root model.")
-    nil
-  end
-end
-
-#########################################################################
-# Will remove all undefined indexes from collection.
-#########################################################################
-def remove_undefined_indexes(model)
-  return if model.embedded?
-#  
-  begin
-    undefined = []
-    model.collection.indexes.each do |index|
-      # ignore default index
-      next if index['name'] == '_id_'
-      
-      key = index['key'].symbolize_keys
-      spec = model.index_specification(key)
-      undefined << index unless spec
-    end
-  rescue Mongo::Error::OperationFailure; end
-#  
-  undefined.each do |index|
-    key = index['key'].symbolize_keys
-    collection = model.collection
-    collection.indexes.drop(key)
-    @logger.info(
-        "MONGOID: Removed index '#{index['name']}' on collection " +
-        "'#{collection.name}' in database '#{collection.database.name}'."
-    )
-  end
-end  
-
 #########################################################################
 # Return array of all models found in application.
 #########################################################################
@@ -70,7 +18,7 @@ def all_models()
     models_dir = File.expand_path("../models", path)
     Dir["#{models_dir}/*.rb"].each do |model_file| 
       model = determine_model(model_file)
-      models << model if !model.nil? and model.respond_to?(:index_specifications)
+      models << model if model and model.respond_to?(:index_specifications)
     end
   end
   models
@@ -82,12 +30,14 @@ end
 namespace :drg_cms do
   desc "Create indexes for all mongoid models. Including those in gem plugins."
   task :create_indexes => :environment do
-    all_models.each {|model| create_index(model)}
+    @logger.info( "MONGOID: Checking indexes.")
+    Mongoid::Tasks::Database.create_indexes(all_models)
   end
 
   desc "Remove undefined indexes for all mongoid models. Including those in gem plugins."
   task :remove_undefined_indexes => :environment do
-    all_models.each {|model| remove_undefined_indexes(model)}
+    @logger.info( "MONGOID: Remove undefined indexes.")
+    Mongoid::Tasks::Database.remove_undefined_indexes(all_models)
   end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.0.6
+  version: 0.6.0.8
 platform: ruby
 authors:
 - Damjan Rems
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-13 00:00:00.000000000 Z
+date: 2020-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -212,6 +212,7 @@ files:
 - app/controls/browse_models_control.rb
 - app/controls/dc_page_control.rb
 - app/controls/dc_poll_result_control.rb
+- app/controls/dc_report.rb
 - app/controls/design_element_settings_control.rb
 - app/forms/all_options.yml
 - app/forms/cms_forms.yml
@@ -256,10 +257,10 @@ files:
 - app/forms/dc_user_role.yml
 - app/forms/drgcms_cms.yml
 - app/forms/json_ld_schema.yml
-- app/helpers/application_helper.rb
-- app/helpers/cmsedit_edit_helper.rb
-- app/helpers/cmsedit_helper.rb
-- app/helpers/cmsedit_index_helper.rb
+- app/helpers/cms_common_helper.rb
+- app/helpers/cms_edit_helper.rb
+- 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
@@ -325,6 +326,7 @@ files:
 - app/models/drgcms_form_fields/html_field.rb
 - app/models/drgcms_form_fields/journal_diff.rb
 - app/models/drgcms_form_fields/link_to.rb
+- app/models/drgcms_form_fields/method.rb
 - app/models/drgcms_form_fields/multitext_autocomplete.rb
 - app/models/drgcms_form_fields/number_field.rb
 - app/models/drgcms_form_fields/password_field.rb
@@ -425,7 +427,7 @@ homepage: http://www.drgcms.org
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -440,40 +442,40 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: 'DRG: Rapid web application development tool and CMS for Ruby, Rails and
   MongoDB'
 test_files:
-- test/lib/generators/new_drg_form_generator_test.rb
 - test/drg_cms_test.rb
 - test/integration/navigation_test.rb
+- test/lib/generators/new_drg_form_generator_test.rb
+- test/dummy/script/rails
 - test/dummy/README.rdoc
-- test/dummy/config/locales/en.yml
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/public/422.html
+- test/dummy/public/404.html
+- test/dummy/public/favicon.ico
+- test/dummy/public/500.html
+- test/dummy/Rakefile
+- test/dummy/config.ru
 - test/dummy/config/environment.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/routes.rb
 - test/dummy/config/application.rb
 - test/dummy/config/database.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/environments/development.rb
 - test/dummy/config/environments/test.rb
 - test/dummy/config/environments/production.rb
-- test/dummy/public/favicon.ico
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/Rakefile
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/config.ru
-- test/dummy/script/rails
+- test/dummy/config/environments/development.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/session_store.rb

data/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end