Sort issue_status filtered text_blocks

Author: sanak

app/controllers/text_blocks_controller.rb

@@ -102,6 +102,6 @@ def get_issue_statuses
   end
 
   def get_blocks_by_status(status_id)
-    IssueStatus.find(status_id).text_blocks.blank? ? text_block_scope : IssueStatus.find(status_id).text_blocks.where(project_id: [nil, @project&.id])
+    IssueStatus.find(status_id).text_blocks.blank? ? text_block_scope : IssueStatus.find(status_id).text_blocks.where(project_id: [nil, @project&.id]).sorted
   end
 end

app/helpers/text_blocks_helper.rb

@@ -6,13 +6,13 @@ def text_block_options(issue=nil)
     end
     status_textblocks = IssueStatus.find(issue.status_id).text_blocks if issue
     if !status_textblocks.blank?
-      tags += status_textblocks.where(project_id: [nil, @project.id]).map{|tb|
+      tags += status_textblocks.where(project_id: [nil, @project.id]).sorted.map{|tb|
         content_tag :option, value: tb.text do
           tb.name
         end
       }
     else
-      tags += TextBlock.where(project_id: [nil, @project.id]).to_a.map{|tb|
+      tags += TextBlock.where(project_id: [nil, @project.id]).sorted.to_a.map{|tb|
         content_tag :option, value: tb.text do
           tb.name
         end