From b945954edab21d668c0fcf3a3bbbc583863bff6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Mon, 18 Jun 2018 13:58:59 +0200 Subject: [PATCH] .freeze by integers makes no sense --- app/models/dmsf_file.rb | 4 ++-- app/models/dmsf_file_revision_access.rb | 4 ++-- app/models/dmsf_folder.rb | 4 ++-- app/models/dmsf_link.rb | 4 ++-- app/models/dmsf_workflow.rb | 14 +++++++------- app/models/dmsf_workflow_step.rb | 4 ++-- app/models/dmsf_workflow_step_action.rb | 10 +++++----- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb index 391f91bd..8a3266dd 100644 --- a/app/models/dmsf_file.rb +++ b/app/models/dmsf_file.rb @@ -45,8 +45,8 @@ class DmsfFile < ActiveRecord::Base :class_name => 'DmsfLink', :foreign_key => 'target_id', :dependent => :destroy has_many :dmsf_public_urls, :dependent => :destroy - STATUS_DELETED = 1.freeze - STATUS_ACTIVE = 0.freeze + STATUS_DELETED = 1 + STATUS_ACTIVE = 0 scope :visible, -> { where(:deleted => STATUS_ACTIVE) } scope :deleted, -> { where(:deleted => STATUS_DELETED) } diff --git a/app/models/dmsf_file_revision_access.rb b/app/models/dmsf_file_revision_access.rb index e2d15ed6..48cada2d 100644 --- a/app/models/dmsf_file_revision_access.rb +++ b/app/models/dmsf_file_revision_access.rb @@ -28,8 +28,8 @@ class DmsfFileRevisionAccess < ActiveRecord::Base validates :dmsf_file_revision, :presence => true - DownloadAction = 0.freeze - EmailAction = 1.freeze + DownloadAction = 0 + EmailAction = 1 acts_as_event :title => Proc.new {|ra| "#{l(:label_dmsf_downloaded)}: #{ra.dmsf_file.dmsf_path_str}"}, :url => Proc.new {|ra| {:controller => 'dmsf_files', :action => 'show', :id => ra.dmsf_file}}, diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb index 194ad68c..640eef10 100644 --- a/app/models/dmsf_folder.rb +++ b/app/models/dmsf_folder.rb @@ -44,8 +44,8 @@ class DmsfFolder < ActiveRecord::Base has_many :dmsf_folder_permissions, :dependent => :destroy INVALID_CHARACTERS = '\[\]\/\\\?":<>#%\*'.freeze - STATUS_DELETED = 1.freeze - STATUS_ACTIVE = 0.freeze + STATUS_DELETED = 1 + STATUS_ACTIVE = 0 AVAILABLE_COLUMNS = %w(id title extension size modified version workflow author).freeze DEFAULT_COLUMNS = %w(title size modified version workflow author).freeze diff --git a/app/models/dmsf_link.rb b/app/models/dmsf_link.rb index a8413d98..c305348a 100644 --- a/app/models/dmsf_link.rb +++ b/app/models/dmsf_link.rb @@ -47,8 +47,8 @@ class DmsfLink < ActiveRecord::Base end end - STATUS_DELETED = 1.freeze - STATUS_ACTIVE = 0.freeze + STATUS_DELETED = 1 + STATUS_ACTIVE = 0 scope :visible, -> { where(:deleted => STATUS_ACTIVE) } scope :deleted, -> { where(:deleted => STATUS_DELETED) } diff --git a/app/models/dmsf_workflow.rb b/app/models/dmsf_workflow.rb index 426390be..554978c1 100644 --- a/app/models/dmsf_workflow.rb +++ b/app/models/dmsf_workflow.rb @@ -57,14 +57,14 @@ class DmsfWorkflow < ActiveRecord::Base end end - STATE_ASSIGNED = 3.freeze - STATE_WAITING_FOR_APPROVAL = 1.freeze - STATE_APPROVED = 2.freeze - STATE_REJECTED = 4.freeze - STATE_OBSOLETE = 5.freeze + STATE_ASSIGNED = 3 + STATE_WAITING_FOR_APPROVAL = 1 + STATE_APPROVED = 2 + STATE_REJECTED = 4 + STATE_OBSOLETE = 5 - STATUS_LOCKED = 0.freeze - STATUS_ACTIVE = 1.freeze + STATUS_LOCKED = 0 + STATUS_ACTIVE = 1 def participiants users = Array.new diff --git a/app/models/dmsf_workflow_step.rb b/app/models/dmsf_workflow_step.rb index b5e771ec..92087a4c 100644 --- a/app/models/dmsf_workflow_step.rb +++ b/app/models/dmsf_workflow_step.rb @@ -31,8 +31,8 @@ class DmsfWorkflowStep < ActiveRecord::Base validates_uniqueness_of :user_id, :scope => [:dmsf_workflow_id, :step] validates_length_of :name, :maximum => 30 - OPERATOR_OR = 0.freeze - OPERATOR_AND = 1.freeze + OPERATOR_OR = 0 + OPERATOR_AND = 1 def soperator DmsfWorkflowStep.soperator(self.operator) diff --git a/app/models/dmsf_workflow_step_action.rb b/app/models/dmsf_workflow_step_action.rb index 90d886a0..689f2fc7 100644 --- a/app/models/dmsf_workflow_step_action.rb +++ b/app/models/dmsf_workflow_step_action.rb @@ -30,11 +30,11 @@ class DmsfWorkflowStepAction < ActiveRecord::Base validates_uniqueness_of :dmsf_workflow_step_assignment_id, :scope => [:action], :unless => lambda {self.action == DmsfWorkflowStepAction::ACTION_DELEGATE} - ACTION_APPROVE = 1.freeze - ACTION_REJECT = 2.freeze - ACTION_DELEGATE = 3.freeze - ACTION_ASSIGN = 4.freeze - ACTION_START = 5.freeze + ACTION_APPROVE = 1 + ACTION_REJECT = 2 + ACTION_DELEGATE = 3 + ACTION_ASSIGN = 4 + ACTION_START = 5 def initialize(*args) super