Fix permit issue and binding.pry

Sort text blocks by global => project order

Author: sanak

app/controllers/text_blocks_controller.rb

@@ -80,7 +80,7 @@ def index_path
   end
 
   def text_block_params
-    params[:text_block].permit :name, :text, :issue_status_ids, :position
+    params[:text_block].permit :name, :text, :position, :issue_status_ids => []
   end
 
   def find_text_block
@@ -102,6 +102,11 @@ 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]).sorted
+    if IssueStatus.find(status_id).text_blocks.blank
+      text_block_scope
+    else
+      IssueStatus.find(status_id).text_blocks.
+        where(project_id: [nil, @project&.id]).sorted
+    end
   end
 end

app/models/text_block.rb

@@ -8,7 +8,7 @@ class TextBlock < ActiveRecord::Base
   validates_numericality_of :position, :only_integer => true
   before_create :set_position
 
-  scope :sorted, ->{ order :position }
+  scope :sorted, ->{ order('project_id IS NOT NULL, project_id ASC, position ASC') }
 
   private
 
@@ -29,10 +29,8 @@ def set_position
       max = self.class.where(:project_id => project_id).maximum(:position) || 0
       self.position = max + 1
     else
-      binding.pry
       max = self.class.where(:project_id => nil).maximum(:position) || 0
       self.position = max + 1
     end
   end
-
 end