From 9023c2c5f7d0d4d45d6655f6e038cc10760f87e7 Mon Sep 17 00:00:00 2001
From: "karel.picman@lbcfree.net" <karel.picman@lbcfree.net>
Date: Wed, 9 Sep 2020 11:46:22 +0200
Subject: [PATCH] Version column in documents table can't display letters #1166

---
 app/models/dmsf_file_revision.rb        | 14 ++++++++++----
 app/models/dmsf_query.rb                |  2 +-
 app/models/dmsf_version_query_column.rb |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb
index c650f5cb..7df1f715 100644
--- a/app/models/dmsf_file_revision.rb
+++ b/app/models/dmsf_file_revision.rb
@@ -144,11 +144,17 @@ class DmsfFileRevision < ActiveRecord::Base
   end
 
   def version
-    ver = DmsfUploadHelper::gui_version(major_version).to_s
-    if -minor_version != ' '.ord
-      ver << ".#{DmsfUploadHelper::gui_version(minor_version)}"
+    DmsfFileRevision.version major_version, minor_version
+  end
+
+  def self.version(major_version, minor_version)
+    if major_version && minor_version
+      ver = DmsfUploadHelper::gui_version(major_version).to_s
+      if -minor_version != ' '.ord
+        ver << ".#{DmsfUploadHelper::gui_version(minor_version)}"
+      end
+      ver
     end
-    ver
   end
   
   def storage_base_path
diff --git a/app/models/dmsf_query.rb b/app/models/dmsf_query.rb
index 17db7d5f..f6eade5f 100644
--- a/app/models/dmsf_query.rb
+++ b/app/models/dmsf_query.rb
@@ -145,7 +145,7 @@ class DmsfQuery < Query
 
   def dmsf_nodes(options={})
     order_option = ['sort', group_by_sort_order, (options[:order] || sort_clause[0])].flatten.reject(&:blank?)
-    if order_option.size > 2
+    if order_option.size > 1
       DmsfFileRevisionCustomField.visible.pluck(:id, :name).each do |id, name|
         order_option[1].gsub!("COALESCE(cf_#{id}.value, '')", "\"#{name}\"")
       end
diff --git a/app/models/dmsf_version_query_column.rb b/app/models/dmsf_version_query_column.rb
index 2e9dfbbb..31728850 100644
--- a/app/models/dmsf_version_query_column.rb
+++ b/app/models/dmsf_version_query_column.rb
@@ -23,7 +23,7 @@
 class DmsfVersionQueryColumn < QueryColumn
 
   def value_object(object)
-    "#{object.major_version}.#{object.minor_version}" if object.major_version && object.minor_version
+    DmsfFileRevision.version object.major_version, object.minor_version
   end
 
 end