Corrected with rubocop cop 'Style/Semicolon'.
This commit is contained in:
parent
b2fd3ba9f0
commit
21a7a87098
5 changed files with 15 additions and 15 deletions
|
@ -20,7 +20,7 @@ module Channel::EmailBuild
|
||||||
|
|
||||||
# set organization
|
# set organization
|
||||||
organization = Setting.get('organization')
|
organization = Setting.get('organization')
|
||||||
if organization then;
|
if organization then
|
||||||
mail['Organization'] = organization.to_s
|
mail['Organization'] = organization.to_s
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ class Observer::Tag::TicketHistory < ActiveRecord::Observer
|
||||||
def after_create(record)
|
def after_create(record)
|
||||||
|
|
||||||
# just process ticket object tags
|
# just process ticket object tags
|
||||||
return true if record.tag_object.name != 'Ticket';
|
return true if record.tag_object.name != 'Ticket'
|
||||||
|
|
||||||
# add ticket history
|
# add ticket history
|
||||||
History.add(
|
History.add(
|
||||||
|
@ -22,7 +22,7 @@ class Observer::Tag::TicketHistory < ActiveRecord::Observer
|
||||||
def after_destroy(record)
|
def after_destroy(record)
|
||||||
|
|
||||||
# just process ticket object tags
|
# just process ticket object tags
|
||||||
return true if record.tag_object.name != 'Ticket';
|
return true if record.tag_object.name != 'Ticket'
|
||||||
|
|
||||||
# add ticket history
|
# add ticket history
|
||||||
History.add(
|
History.add(
|
||||||
|
|
|
@ -555,7 +555,7 @@ module Import::OTRS
|
||||||
ID: :id,
|
ID: :id,
|
||||||
ValidID: :active,
|
ValidID: :active,
|
||||||
Comment: :note,
|
Comment: :note,
|
||||||
};
|
}
|
||||||
|
|
||||||
Ticket::State.all.each {|state|
|
Ticket::State.all.each {|state|
|
||||||
state.name = state.name + '_tmp'
|
state.name = state.name + '_tmp'
|
||||||
|
@ -611,7 +611,7 @@ module Import::OTRS
|
||||||
ID: :id,
|
ID: :id,
|
||||||
ValidID: :active,
|
ValidID: :active,
|
||||||
Comment: :note,
|
Comment: :note,
|
||||||
};
|
}
|
||||||
|
|
||||||
result.each { |priority|
|
result.each { |priority|
|
||||||
_set_valid(priority)
|
_set_valid(priority)
|
||||||
|
@ -655,7 +655,7 @@ module Import::OTRS
|
||||||
QueueID: :id,
|
QueueID: :id,
|
||||||
ValidID: :active,
|
ValidID: :active,
|
||||||
Comment: :note,
|
Comment: :note,
|
||||||
};
|
}
|
||||||
|
|
||||||
result.each { |group|
|
result.each { |group|
|
||||||
_set_valid(group)
|
_set_valid(group)
|
||||||
|
@ -702,7 +702,7 @@ module Import::OTRS
|
||||||
UserLastname: :lastname,
|
UserLastname: :lastname,
|
||||||
UserLogin: :login,
|
UserLogin: :login,
|
||||||
UserPw: :password,
|
UserPw: :password,
|
||||||
};
|
}
|
||||||
|
|
||||||
result.each { |user|
|
result.each { |user|
|
||||||
# puts 'USER: ' + user.inspect
|
# puts 'USER: ' + user.inspect
|
||||||
|
@ -770,7 +770,7 @@ module Import::OTRS
|
||||||
UserZip: :zip,
|
UserZip: :zip,
|
||||||
UserCity: :city,
|
UserCity: :city,
|
||||||
UserCountry: :country,
|
UserCountry: :country,
|
||||||
};
|
}
|
||||||
|
|
||||||
done = true
|
done = true
|
||||||
result.each { |user|
|
result.each { |user|
|
||||||
|
|
|
@ -803,7 +803,7 @@ module Import::OTRS2
|
||||||
ID: :id,
|
ID: :id,
|
||||||
ValidID: :active,
|
ValidID: :active,
|
||||||
Comment: :note,
|
Comment: :note,
|
||||||
};
|
}
|
||||||
|
|
||||||
# rename states to handle not uniq issues
|
# rename states to handle not uniq issues
|
||||||
Ticket::State.all.each {|state|
|
Ticket::State.all.each {|state|
|
||||||
|
@ -858,7 +858,7 @@ module Import::OTRS2
|
||||||
ID: :id,
|
ID: :id,
|
||||||
ValidID: :active,
|
ValidID: :active,
|
||||||
Comment: :note,
|
Comment: :note,
|
||||||
};
|
}
|
||||||
|
|
||||||
records.each { |priority|
|
records.each { |priority|
|
||||||
_set_valid(priority)
|
_set_valid(priority)
|
||||||
|
@ -899,7 +899,7 @@ module Import::OTRS2
|
||||||
QueueID: :id,
|
QueueID: :id,
|
||||||
ValidID: :active,
|
ValidID: :active,
|
||||||
Comment: :note,
|
Comment: :note,
|
||||||
};
|
}
|
||||||
|
|
||||||
records.each { |group|
|
records.each { |group|
|
||||||
_set_valid(group)
|
_set_valid(group)
|
||||||
|
@ -945,7 +945,7 @@ module Import::OTRS2
|
||||||
UserLastname: :lastname,
|
UserLastname: :lastname,
|
||||||
UserLogin: :login,
|
UserLogin: :login,
|
||||||
UserPw: :password,
|
UserPw: :password,
|
||||||
};
|
}
|
||||||
|
|
||||||
records.each { |user|
|
records.each { |user|
|
||||||
_set_valid(user)
|
_set_valid(user)
|
||||||
|
@ -1072,7 +1072,7 @@ module Import::OTRS2
|
||||||
UserZip: :zip,
|
UserZip: :zip,
|
||||||
UserCity: :city,
|
UserCity: :city,
|
||||||
UserCountry: :country,
|
UserCountry: :country,
|
||||||
};
|
}
|
||||||
|
|
||||||
role_agent = Role.lookup( name: 'Agent' )
|
role_agent = Role.lookup( name: 'Agent' )
|
||||||
role_customer = Role.lookup( name: 'Customer' )
|
role_customer = Role.lookup( name: 'Customer' )
|
||||||
|
@ -1142,7 +1142,7 @@ module Import::OTRS2
|
||||||
CustomerCompanyName: :name,
|
CustomerCompanyName: :name,
|
||||||
ValidID: :active,
|
ValidID: :active,
|
||||||
CustomerCompanyComment: :note,
|
CustomerCompanyComment: :note,
|
||||||
};
|
}
|
||||||
|
|
||||||
records.each { |organization|
|
records.each { |organization|
|
||||||
_set_valid(organization)
|
_set_valid(organization)
|
||||||
|
|
|
@ -55,7 +55,7 @@ end.parse!
|
||||||
|
|
||||||
if ARGV[0] != 'start' && ARGV[0] != 'stop'
|
if ARGV[0] != 'start' && ARGV[0] != 'stop'
|
||||||
puts "Usage: #{File.basename(__FILE__)} start|stop [options]"
|
puts "Usage: #{File.basename(__FILE__)} start|stop [options]"
|
||||||
exit;
|
exit
|
||||||
end
|
end
|
||||||
|
|
||||||
puts "Starting websocket server on #{ @options[:b] }:#{ @options[:p] } (secure:#{ @options[:s].to_s },pid:#{@options[:i].to_s})"
|
puts "Starting websocket server on #{ @options[:b] }:#{ @options[:p] } (secure:#{ @options[:s].to_s },pid:#{@options[:i].to_s})"
|
||||||
|
|
Loading…
Reference in a new issue