Merge pull request #215 from sensu/sort_version_numbers

pzupan · web-flow · commit 3d62baa34f88 · 2019-08-29T15:01:49.000-07:00
fix version sort order
diff --git a/app/models/extension.rb b/app/models/extension.rb
@@ -172,7 +172,7 @@ def self.total_download_count
   def sorted_extension_versions
     # ignore preceding 'V' and ignore 'master' so it sorts to end
     # convert version to array of integers so 10.0.0 comes after 9.0.0
-    @sorted_extension_versions ||= extension_versions.order(Arel.sql("STRING_TO_ARRAY( REGEXP_REPLACE(extension_versions.version, E'V|v|master', ''), '.') DESC"))
+    @sorted_extension_versions ||= extension_versions.order(Arel.sql("STRING_TO_ARRAY( REGEXP_REPLACE(extension_versions.version, E'V|v|master|-(.*)', ''), '.')::int[] DESC"))
   end
 
   #

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ def self.total_download_count`
`172`	`172`	`def sorted_extension_versions`
`173`	`173`	`# ignore preceding 'V' and ignore 'master' so it sorts to end`
`174`	`174`	`# convert version to array of integers so 10.0.0 comes after 9.0.0`
`175`		`- @sorted_extension_versions \|\|= extension_versions.order(Arel.sql("STRING_TO_ARRAY( REGEXP_REPLACE(extension_versions.version, E'V\|v\|master', ''), '.') DESC"))`
	`175`	`+ @sorted_extension_versions \|\|= extension_versions.order(Arel.sql("STRING_TO_ARRAY( REGEXP_REPLACE(extension_versions.version, E'V\|v\|master\|-(.*)', ''), '.')::int[] DESC"))`
`176`	`176`	`end`
`177`	`177`
`178`	`178`	`#`