doc_contract 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8bf71ecf102ece032fb389c712f87952492ffab66f2316b9f2a08a14c78a377
-  data.tar.gz: 315c59f51e3f2639cb3dc98a714b8be9cbe528bb407ce5bea0076bbeacf0a038
+  metadata.gz: 10539557dfc2459c982fd3f6eb174e5012e5d7db7cf4001a38f684ce96d758cb
+  data.tar.gz: 5417b3780907dacd938cbb937b87381b1218ac839fcbfe7f6f6a6611ff08f006
 SHA512:
-  metadata.gz: 2d5e249c5e2e04e8d1129ae3e58a1fff499632cf2887e0d603c7fb6b4935961bbdd3a1bd690fa6746754375356011f64215d842c715e58828f8d9fcf2cb59551
-  data.tar.gz: a1c6c894ac00bd866f5e86d2e4ed657763e5c4114a80c38a62fc1d2c161fa35b0f4074514463eb8820a922ed3e69389cf2fa492dd2902477c0094db0bfa5f834
+  metadata.gz: 9fa4bb103d56400fd0599ccba7a20e475583ea704e7bcf20eb306960aa0d82b29c86f5e83cbcba6f38caaa3a76643000f9c1f04308148f5fa98d2344d9c4548d
+  data.tar.gz: 431cb7417342a0ff44f31040ec78f2dd7798882d5bedfb29159fc4ac8795f726de11fa5063b4e9209fe015c0cf951f12eb86c2579731681b4d7dd3451526ae0a

data/app/controllers/doc_contract/contract_instances_controller.rb

@@ -7,7 +7,7 @@ module DocContract
     def index
       authorize! :index, record_class
       @q = record_class.ransack query
-      @q.sorts = "created_at desc" if @q.sorts.empty?
+      @q.sorts = 'name asc' if @q.sorts.empty?
       @records = @q.result.includes(:contract_template).page(params[:page]).per(100)
       respond_with(@records)
     end

data/app/controllers/doc_contract/contract_templates_controller.rb

@@ -7,7 +7,7 @@ module DocContract
     def index
       authorize! :index, record_class
       @q = record_class.ransack query
-      @q.sorts = 'created_at desc' if @q.sorts.empty?
+      @q.sorts = 'name asc' if @q.sorts.empty?
       @records = @q.result.page(params[:page]).per(100)
       respond_with(@records)
     end

data/app/models/doc_contract/contract_instance.rb

@@ -4,7 +4,7 @@ module DocContract
     belongs_to :contract_template
 
     def config
-      own_config = YAML.load(config_yml.to_s) || {}
+      own_config = YAML.safe_load(config_yml.to_s, permitted_classes: [Symbol, Date]) || {}
       own_config.reverse_merge contract_template.config
     end
 

data/app/models/doc_contract/contract_template.rb

@@ -7,7 +7,7 @@ module DocContract
     validates :config_yml, yaml: true
 
     def config
-      YAML.load(config_yml.to_s) || {}
+      YAML.safe_load(config_yml.to_s, permitted_classes: [Symbol, Date]) || {}
     end
 
     def processed_markdown(config_addittions = {})

data/app/views/doc_contract/contract_instances/index.html.slim

@@ -6,8 +6,8 @@
       table.ui.compact.top.attached.striped.table
         thead
           tr
-            th= at :name
-            th= DocContract::ContractTemplate.model_name.human
+            th= sort_link @q, :name, at(:name), default_order: :asc
+            th= sort_link @q, :contract_template_name, DocContract::ContractTemplate.model_name.human
             th.column-filter.actions
               = search_result_info @records
           = search_row class: 'ui mini form' do

data/app/views/doc_contract/contract_templates/index.html.slim

@@ -6,7 +6,7 @@
       table.ui.compact.top.attached.striped.table
         thead
           tr
-            th= at :name
+            th= sort_link @q, :name, at(:name), default_order: :asc
             th.column-filter.actions
               = search_result_info @records
           = search_row class: 'ui mini form' do

data/lib/doc_contract/version.rb

@@ -1,3 +1,3 @@
 module DocContract
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doc_contract
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Benjamin ter Kuile