Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Applied rubocop Style/SpaceAfterComma.

Browse source
This commit is contained in:
Martin Edenhofer 2015-04-27 16:53:29 +02:00
parent 081d71ffa3
commit 16ddef38e9
34 changed files with 78 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/online_notifications_controller.rb
View file

@ -105,7 +105,7 @@ curl http://localhost/api/v1/online_notifications/mark_all_as_read -v -u #{login
=end =end
def mark_all_as_read def mark_all_as_read
notifications = OnlineNotification.list(current_user,100) notifications = OnlineNotification.list(current_user, 100)
notifications.each do |notification| notifications.each do |notification|
if !notification['seen'] if !notification['seen']
OnlineNotification.seen( id: notification['id'] ) OnlineNotification.seen( id: notification['id'] )

2
app/controllers/taskbar_controller.rb
View file

@ -18,7 +18,7 @@ class TaskbarController < ApplicationController
end end
def create def create
model_create_render(Taskbar,params) model_create_render(Taskbar, params)
end end
def update def update

2
app/models/activity_stream.rb
View file

@ -89,7 +89,7 @@ return all activity entries of an user
=end =end
def self.list(user,limit) def self.list(user, limit)
role_ids = user.role_ids role_ids = user.role_ids
group_ids = user.group_ids group_ids = user.group_ids

8
app/models/application_model.rb
View file

@ -108,7 +108,7 @@ returns
# set relations # set relations
self.class.reflect_on_all_associations.map { |assoc| self.class.reflect_on_all_associations.map { |assoc|
real_key = assoc.name.to_s[0,assoc.name.to_s.length - 1] + '_ids' real_key = assoc.name.to_s[0, assoc.name.to_s.length - 1] + '_ids'
if params.has_key?( real_key.to_sym ) if params.has_key?( real_key.to_sym )
list_of_items = params[ real_key.to_sym ] list_of_items = params[ real_key.to_sym ]
if params[ real_key.to_sym ].class != Array if params[ real_key.to_sym ].class != Array
@ -141,7 +141,7 @@ returns
# set relations # set relations
attributes = self.attributes attributes = self.attributes
self.class.reflect_on_all_associations.map { |assoc| self.class.reflect_on_all_associations.map { |assoc|
real_key = assoc.name.to_s[0,assoc.name.to_s.length - 1] + '_ids' real_key = assoc.name.to_s[0, assoc.name.to_s.length - 1] + '_ids'
if self.respond_to?( real_key ) if self.respond_to?( real_key )
attributes[ real_key ] = self.send( real_key ) attributes[ real_key ] = self.send( real_key )
end end
@ -872,13 +872,13 @@ log object update history with all updated attributes, if configured - will be e
# get attribute name # get attribute name
attribute_name = key.to_s attribute_name = key.to_s
if attribute_name[-3,3] == '_id' if attribute_name[-3, 3] == '_id'
attribute_name = attribute_name[ 0, attribute_name.length - 3 ] attribute_name = attribute_name[ 0, attribute_name.length - 3 ]
end end
value_id = [] value_id = []
value_str = [ value[0], value[1] ] value_str = [ value[0], value[1] ]
if key.to_s[-3,3] == '_id' if key.to_s[-3, 3] == '_id'
value_id[0] = value[0] value_id[0] = value[0]
value_id[1] = value[1] value_id[1] = value[1]

2
app/models/application_model/search_index_base.rb
View file

@ -112,7 +112,7 @@ returns
# get attribute name # get attribute name
attribute_name_with_id = key.to_s attribute_name_with_id = key.to_s
attribute_name = key.to_s attribute_name = key.to_s
next if attribute_name[-3,3] != '_id' next if attribute_name[-3, 3] != '_id'
attribute_name = attribute_name[ 0, attribute_name.length - 3 ] attribute_name = attribute_name[ 0, attribute_name.length - 3 ]
# check if attribute method exists # check if attribute method exists

2
app/models/channel/email_parser.rb
View file

@ -526,7 +526,7 @@ class Channel::EmailParser
def set_attributes_by_x_headers( item_object, header_name, mail ) def set_attributes_by_x_headers( item_object, header_name, mail )
# loop all x-zammad-hedaer-* headers # loop all x-zammad-hedaer-* headers
item_object.attributes.each{|key,value| item_object.attributes.each{|key, value|
# ignore read only attributes # ignore read only attributes
next if key == 'updated_at' next if key == 'updated_at'

4
app/models/channel/imap.rb
View file

@ -65,7 +65,7 @@ class Channel::IMAP < Channel::EmailParser
# check for verify message # check for verify message
if check_type == 'verify' if check_type == 'verify'
subject = @imap.fetch(message_id,'ENVELOPE')[0].attr['ENVELOPE'].subject subject = @imap.fetch(message_id, 'ENVELOPE')[0].attr['ENVELOPE'].subject
if subject && subject =~ /#{verify_string}/ if subject && subject =~ /#{verify_string}/
puts " - verify email #{verify_string} found" puts " - verify email #{verify_string} found"
@imap.store(message_id, '+FLAGS', [:Deleted]) @imap.store(message_id, '+FLAGS', [:Deleted])
@ -76,7 +76,7 @@ class Channel::IMAP < Channel::EmailParser
else else
# delete email from server after article was created # delete email from server after article was created
msg = @imap.fetch(message_id,'RFC822')[0].attr['RFC822'] msg = @imap.fetch(message_id, 'RFC822')[0].attr['RFC822']
if process(channel, msg) if process(channel, msg)
@imap.store(message_id, '+FLAGS', [:Deleted]) @imap.store(message_id, '+FLAGS', [:Deleted])
end end

2
app/models/channel/twitter2.rb
View file

@ -227,7 +227,7 @@ class Channel::TWITTER2
ticket = Ticket.create( ticket = Ticket.create(
group_id: group_id, group_id: group_id,
customer_id: user.id, customer_id: user.id,
title: tweet.text[0,40], title: tweet.text[0, 40],
state_id: state_id, state_id: state_id,
priority_id: priority_id, priority_id: priority_id,
) )

8
app/models/observer/ticket/notification/background_job.rb
View file

@ -165,7 +165,7 @@ class Observer::Ticket::Notification::BackgroundJob
# get attribute name # get attribute name
attribute_name = key.to_s attribute_name = key.to_s
object_manager_attribute = attribute_list[attribute_name] object_manager_attribute = attribute_list[attribute_name]
if attribute_name[-3,3] == '_id' if attribute_name[-3, 3] == '_id'
attribute_name = attribute_name[ 0, attribute_name.length - 3 ].to_s attribute_name = attribute_name[ 0, attribute_name.length - 3 ].to_s
end end
@ -177,7 +177,7 @@ class Observer::Ticket::Notification::BackgroundJob
# if changed item is an _id field/reference, do an lookup for the realy values # if changed item is an _id field/reference, do an lookup for the realy values
value_id = [] value_id = []
value_str = [ value[0], value[1] ] value_str = [ value[0], value[1] ]
if key.to_s[-3,3] == '_id' if key.to_s[-3, 3] == '_id'
value_id[0] = value[0] value_id[0] = value[0]
value_id[1] = value[1] value_id[1] = value[1]
@ -289,7 +289,7 @@ State: i18n(#{ticket.state.name.text2html})<br>
def template_update(user, ticket, article, ticket_changes) def template_update(user, ticket, article, ticket_changes)
changes = '' changes = ''
ticket_changes.each {|key,value| ticket_changes.each {|key, value|
changes += "i18n(#{key.to_s.text2html}): #{value[0].to_s.text2html} -> #{value[1].to_s.text2html}<br>\n" changes += "i18n(#{key.to_s.text2html}): #{value[0].to_s.text2html} -> #{value[1].to_s.text2html}<br>\n"
} }
article_content = '' article_content = ''
@ -339,7 +339,7 @@ Changes:<br>
end end
body = template_header(user) + body body = template_header(user) + body
body += template_footer(user,ticket, article) body += template_footer(user, ticket, article)
template = { template = {
subject: subject, subject: subject,

4
app/models/online_notification.rb
View file

@ -85,7 +85,7 @@ return all online notifications of an user
=end =end
def self.list(user,limit) def self.list(user, limit)
notifications = OnlineNotification.where(user_id: user.id). notifications = OnlineNotification.where(user_id: user.id).
order( 'created_at DESC, id DESC' ). order( 'created_at DESC, id DESC' ).
@ -167,7 +167,7 @@ returns:
=end =end
def self.list_full(user,limit) def self.list_full(user, limit)
notifications = OnlineNotification.list(user, limit) notifications = OnlineNotification.list(user, limit)
assets = ApplicationModel.assets_of_object_list(notifications) assets = ApplicationModel.assets_of_object_list(notifications)

2
app/models/organization/search_index.rb
View file

@ -21,7 +21,7 @@ returns
# get attribute name # get attribute name
attribute_name = key.to_s attribute_name = key.to_s
next if attribute_name[-3,3] != '_id' next if attribute_name[-3, 3] != '_id'
attribute_name = attribute_name[ 0, attribute_name.length - 3 ] attribute_name = attribute_name[ 0, attribute_name.length - 3 ]
# check if attribute method exists # check if attribute method exists

2
app/models/store/provider/file.rb
View file

@ -60,7 +60,7 @@ class Store::Provider::File
end end
# write file to fs # write file to fs
def self.write_to_fs(data,sha) def self.write_to_fs(data, sha)
# install file # install file
permission = '600' permission = '600'

2
app/models/user.rb
View file

@ -366,7 +366,7 @@ returns
=end =end
def self.password_reset_via_token(token,password) def self.password_reset_via_token(token, password)
# check token # check token
user = Token.check( action: 'PasswordReset', name: token ) user = Token.check( action: 'PasswordReset', name: token )

2
config/routes/network.rb
View file

@ -6,6 +6,6 @@ Zammad::Application.routes.draw do
match api_path + '/networks/:id', to: 'networks#show', via: :get match api_path + '/networks/:id', to: 'networks#show', via: :get
match api_path + '/networks', to: 'networks#create', via: :post match api_path + '/networks', to: 'networks#create', via: :post
match api_path + '/networks/:id', to: 'networks#update', via: :put match api_path + '/networks/:id', to: 'networks#update', via: :put
match api_path + '/networks/:id', to: 'networks#destroy',via: :delete match api_path + '/networks/:id', to: 'networks#destroy', via: :delete
end end

2
config/routes/organization.rb
View file

@ -6,6 +6,6 @@ Zammad::Application.routes.draw do
match api_path + '/organizations/:id', to: 'organizations#show', via: :get match api_path + '/organizations/:id', to: 'organizations#show', via: :get
match api_path + '/organizations', to: 'organizations#create', via: :post match api_path + '/organizations', to: 'organizations#create', via: :post
match api_path + '/organizations/:id', to: 'organizations#update', via: :put match api_path + '/organizations/:id', to: 'organizations#update', via: :put
match api_path + '/organizations/history/:id',to: 'organizations#history',via: :get match api_path + '/organizations/history/:id', to: 'organizations#history', via: :get
end end

2
config/routes/taskbar.rb
View file

@ -5,6 +5,6 @@ Zammad::Application.routes.draw do
match api_path + '/taskbar/:id', to: 'taskbar#show', via: :get match api_path + '/taskbar/:id', to: 'taskbar#show', via: :get
match api_path + '/taskbar', to: 'taskbar#create', via: :post match api_path + '/taskbar', to: 'taskbar#create', via: :post
match api_path + '/taskbar/:id', to: 'taskbar#update', via: :put match api_path + '/taskbar/:id', to: 'taskbar#update', via: :put
match api_path + '/taskbar/:id', to: 'taskbar#destroy',via: :delete match api_path + '/taskbar/:id', to: 'taskbar#destroy', via: :delete
end end

2
db/migrate/20120101000001_create_base.rb
View file

@ -33,7 +33,7 @@ class CreateBase < ActiveRecord::Migration
t.column :last_login, :timestamp, null: true t.column :last_login, :timestamp, null: true
t.column :source, :string, limit: 200, null: true t.column :source, :string, limit: 200, null: true
t.column :login_failed, :integer, null: false, default: 0 t.column :login_failed, :integer, null: false, default: 0
t.column :preferences, :string, limit: 8000,null: true t.column :preferences, :string, limit: 8000, null: true
t.column :updated_by_id, :integer, null: false t.column :updated_by_id, :integer, null: false
t.column :created_by_id, :integer, null: false t.column :created_by_id, :integer, null: false
t.timestamps t.timestamps

4
db/migrate/20120101000010_create_ticket.rb
View file

@ -35,10 +35,10 @@ class CreateTicket < ActiveRecord::Migration
t.references :state, null: false t.references :state, null: false
t.references :organization, null: true t.references :organization, null: true
t.column :number, :string, limit: 60, null: false t.column :number, :string, limit: 60, null: false
t.column :title, :string, limit: 250,null: false t.column :title, :string, limit: 250, null: false
t.column :owner_id, :integer, null: false t.column :owner_id, :integer, null: false
t.column :customer_id, :integer, null: false t.column :customer_id, :integer, null: false
t.column :note, :string, limit: 250,null: true t.column :note, :string, limit: 250, null: true
t.column :first_response, :timestamp, null: true t.column :first_response, :timestamp, null: true
t.column :first_response_escal_date, :timestamp, null: true t.column :first_response_escal_date, :timestamp, null: true
t.column :first_response_sla_time, :timestamp, null: true t.column :first_response_sla_time, :timestamp, null: true

12
db/migrate/20140831000001_create_object_manager.rb
View file

@ -168,7 +168,7 @@ class CreateObjectManager < ActiveRecord::Migration
null: false, null: false,
default: 2, default: 2,
translate: true, translate: true,
filter: [1,2,3,4,7], filter: [1, 2, 3, 4, 7],
}, },
editable: false, editable: false,
active: true, active: true,
@ -182,7 +182,7 @@ class CreateObjectManager < ActiveRecord::Migration
item_class: 'column', item_class: 'column',
nulloption: false, nulloption: false,
null: true, null: true,
filter: [1,4], filter: [1, 4],
default: 1, default: 1,
}, },
}, },
@ -190,12 +190,12 @@ class CreateObjectManager < ActiveRecord::Migration
Agent: { Agent: {
nulloption: false, nulloption: false,
null: false, null: false,
filter: [2,3,4,7], filter: [2, 3, 4, 7],
}, },
Customer: { Customer: {
nulloption: false, nulloption: false,
null: true, null: true,
filter: [2,4], filter: [2, 4],
default: 2, default: 2,
}, },
}, },
@ -217,10 +217,10 @@ class CreateObjectManager < ActiveRecord::Migration
null: true, null: true,
translate: true, translate: true,
required_if: { required_if: {
state_id: [3,7] state_id: [3, 7]
}, },
shown_if: { shown_if: {
state_id: [3,7] state_id: [3, 7]
}, },
}, },
editable: false, editable: false,

12
db/migrate/20150112000001_update_overview_and_ticket_state.rb
View file

@ -43,7 +43,7 @@ class UpdateOverviewAndTicketState < ActiveRecord::Migration
null: false, null: false,
default: 2, default: 2,
translate: true, translate: true,
filter: [1,2,3,4,7], filter: [1, 2, 3, 4, 7],
}, },
editable: false, editable: false,
active: true, active: true,
@ -57,7 +57,7 @@ class UpdateOverviewAndTicketState < ActiveRecord::Migration
item_class: 'column', item_class: 'column',
nulloption: false, nulloption: false,
null: true, null: true,
filter: [1,4], filter: [1, 4],
default: 1, default: 1,
}, },
}, },
@ -65,12 +65,12 @@ class UpdateOverviewAndTicketState < ActiveRecord::Migration
Agent: { Agent: {
nulloption: false, nulloption: false,
null: false, null: false,
filter: [2,3,4,7], filter: [2, 3, 4, 7],
}, },
Customer: { Customer: {
nulloption: false, nulloption: false,
null: true, null: true,
filter: [2,4], filter: [2, 4],
default: 2, default: 2,
}, },
}, },
@ -93,10 +93,10 @@ class UpdateOverviewAndTicketState < ActiveRecord::Migration
null: true, null: true,
translate: true, translate: true,
required_if: { required_if: {
state_id: [3,7] state_id: [3, 7]
}, },
shown_if: { shown_if: {
state_id: [3,7] state_id: [3, 7]
}, },
}, },
editable: false, editable: false,

2
db/migrate/20150223000001_update_overview2.rb
View file

@ -10,7 +10,7 @@ class UpdateOverview2 < ActiveRecord::Migration
prio: 1000, prio: 1000,
role_id: overview_role.id, role_id: overview_role.id,
condition: { condition: {
'tickets.state_id' => [ 1,2,3,7 ], 'tickets.state_id' => [ 1, 2, 3, 7 ],
'tickets.owner_id' => 'current_user.id', 'tickets.owner_id' => 'current_user.id',
}, },
order: { order: {

12
db/seeds.rb
View file

@ -1406,7 +1406,7 @@ Overview.create_if_not_exists(
prio: 1000, prio: 1000,
role_id: overview_role.id, role_id: overview_role.id,
condition: { condition: {
'tickets.state_id' => [ 1,2,3,7 ], 'tickets.state_id' => [ 1, 2, 3, 7 ],
'tickets.owner_id' => 'current_user.id', 'tickets.owner_id' => 'current_user.id',
}, },
order: { order: {
@ -1449,7 +1449,7 @@ Overview.create_if_not_exists(
prio: 1020, prio: 1020,
role_id: overview_role.id, role_id: overview_role.id,
condition: { condition: {
'tickets.state_id' => [1,2,3], 'tickets.state_id' => [1, 2, 3],
'tickets.owner_id' => 1, 'tickets.owner_id' => 1,
}, },
order: { order: {
@ -1470,7 +1470,7 @@ Overview.create_if_not_exists(
prio: 1030, prio: 1030,
role_id: overview_role.id, role_id: overview_role.id,
condition: { condition: {
'tickets.state_id' => [1,2,3], 'tickets.state_id' => [1, 2, 3],
}, },
order: { order: {
by: 'created_at', by: 'created_at',
@ -1478,7 +1478,7 @@ Overview.create_if_not_exists(
}, },
view: { view: {
d: [ 'title', 'customer', 'group', 'state', 'owner', 'created_at' ], d: [ 'title', 'customer', 'group', 'state', 'owner', 'created_at' ],
s: [ 'title', 'customer', 'group', 'state', 'owner','created_at' ], s: [ 'title', 'customer', 'group', 'state', 'owner', 'created_at' ],
m: [ 'number', 'title', 'customer', 'group', 'state', 'owner', 'created_at' ], m: [ 'number', 'title', 'customer', 'group', 'state', 'owner', 'created_at' ],
view_mode_default: 's', view_mode_default: 's',
}, },
@ -1532,7 +1532,7 @@ Overview.create_if_not_exists(
prio: 1000, prio: 1000,
role_id: overview_role.id, role_id: overview_role.id,
condition: { condition: {
'tickets.state_id' => [ 1,2,3,4,6 ], 'tickets.state_id' => [ 1, 2, 3, 4, 6 ],
'tickets.customer_id' => 'current_user.id', 'tickets.customer_id' => 'current_user.id',
}, },
order: { order: {
@ -1553,7 +1553,7 @@ Overview.create_if_not_exists(
role_id: overview_role.id, role_id: overview_role.id,
organization_shared: true, organization_shared: true,
condition: { condition: {
'tickets.state_id' => [ 1,2,3,4,6 ], 'tickets.state_id' => [ 1, 2, 3, 4, 6 ],
'tickets.organization_id' => 'current_user.organization_id', 'tickets.organization_id' => 'current_user.organization_id',
}, },
order: { order: {

4
lib/core_ext/class.rb
View file

@ -2,8 +2,8 @@ class Class
def to_app_model_url def to_app_model_url
camel_cased_word = self.to_s camel_cased_word = self.to_s
camel_cased_word.gsub(/::/, '_'). camel_cased_word.gsub(/::/, '_').
gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2'). gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
gsub(/([a-z\d])([A-Z])/,'\1_\2'). gsub(/([a-z\d])([A-Z])/, '\1_\2').
tr('-', '_'). tr('-', '_').
downcase downcase
end end

4
lib/geo_location.rb
View file

@ -37,13 +37,13 @@ returns
=end =end
def self.reverse_geocode(lat,lng) def self.reverse_geocode(lat, lng)
# load backend # load backend
backend = self.load_adapter_by_setting( 'geo_location_backend' ) backend = self.load_adapter_by_setting( 'geo_location_backend' )
return if !backend return if !backend
# db lookup # db lookup
backend.reverse_geocode(lat,lng) backend.reverse_geocode(lat, lng)
end end
end end

4
lib/geo_location/gmaps.rb
View file

@ -15,10 +15,10 @@ class GeoLocation::Gmaps
lat = result['results'].first['geometry']['location']['lat'] lat = result['results'].first['geometry']['location']['lat']
lng = result['results'].first['geometry']['location']['lng'] lng = result['results'].first['geometry']['location']['lng']
latlng = [lat,lng] latlng = [lat, lng]
end end
def self.reverse_geocode(lat,lng) def self.reverse_geocode(lat, lng)
url = "http://maps.googleapis.com/maps/api/geocode/json?latlng=#{lat},#{lng}&sensor=true" url = "http://maps.googleapis.com/maps/api/geocode/json?latlng=#{lat},#{lng}&sensor=true"
response = UserAgent.get(url) response = UserAgent.get(url)
return if !response.success? return if !response.success?

18
lib/import/otrs.rb
View file

@ -67,7 +67,7 @@ module Import::OTRS
required_group_ro: 'groups_ro', required_group_ro: 'groups_ro',
required_group_rw: 'groups_rw', required_group_rw: 'groups_rw',
} }
types.each {|config_key,result_key| types.each {|config_key, result_key|
if config[config_key] if config[config_key]
return false if !result[result_key].has_value?( config[config_key] ) return false if !result[result_key].has_value?( config[config_key] )
end end
@ -82,7 +82,7 @@ module Import::OTRS
group_ro_role_map: 'groups_ro', group_ro_role_map: 'groups_ro',
group_rw_role_map: 'groups_rw', group_rw_role_map: 'groups_rw',
} }
types.each {|config_key,result_key| types.each {|config_key, result_key|
next if !config[config_key] next if !config[config_key]
config[config_key].each {|otrs_group, role| config[config_key].each {|otrs_group, role|
next if !result[result_key].has_value?( otrs_group ) next if !result[result_key].has_value?( otrs_group )
@ -278,7 +278,7 @@ module Import::OTRS
created_by_id: 1, created_by_id: 1,
updated_by_id: 1, updated_by_id: 1,
} }
map[:Ticket].each { |key,value| map[:Ticket].each { |key, value|
if record['Ticket'][key.to_s] && record['Ticket'][key.to_s].class == String if record['Ticket'][key.to_s] && record['Ticket'][key.to_s].class == String
ticket_new[value] = Encode.conv( 'utf8', record['Ticket'][key.to_s] ) ticket_new[value] = Encode.conv( 'utf8', record['Ticket'][key.to_s] )
else else
@ -331,7 +331,7 @@ module Import::OTRS
created_by_id: 1, created_by_id: 1,
updated_by_id: 1, updated_by_id: 1,
} }
map[:Article].each { |key,value| map[:Article].each { |key, value|
if article[key.to_s] if article[key.to_s]
article_new[value] = Encode.conv( 'utf8', article[key.to_s] ) article_new[value] = Encode.conv( 'utf8', article[key.to_s] )
end end
@ -572,7 +572,7 @@ module Import::OTRS
created_by_id: 1, created_by_id: 1,
updated_by_id: 1, updated_by_id: 1,
} }
map.each { |key,value| map.each { |key, value|
if state[key.to_s] if state[key.to_s]
state_new[value] = state[key.to_s] state_new[value] = state[key.to_s]
end end
@ -623,7 +623,7 @@ module Import::OTRS
created_by_id: 1, created_by_id: 1,
updated_by_id: 1, updated_by_id: 1,
} }
map.each { |key,value| map.each { |key, value|
if priority[key.to_s] if priority[key.to_s]
priority_new[value] = priority[key.to_s] priority_new[value] = priority[key.to_s]
end end
@ -667,7 +667,7 @@ module Import::OTRS
created_by_id: 1, created_by_id: 1,
updated_by_id: 1, updated_by_id: 1,
} }
map.each { |key,value| map.each { |key, value|
if group[key.to_s] if group[key.to_s]
group_new[value] = group[key.to_s] group_new[value] = group[key.to_s]
end end
@ -719,7 +719,7 @@ module Import::OTRS
source: 'OTRS Import', source: 'OTRS Import',
role_ids: [ role.id ], role_ids: [ role.id ],
} }
map.each { |key,value| map.each { |key, value|
if user[key.to_s] if user[key.to_s]
user_new[value] = user[key.to_s] user_new[value] = user[key.to_s]
end end
@ -793,7 +793,7 @@ module Import::OTRS
source: 'OTRS Import', source: 'OTRS Import',
role_ids: [role.id], role_ids: [role.id],
} }
map.each { |key,value| map.each { |key, value|
if user[key.to_s] if user[key.to_s]
user_new[value] = user[key.to_s] user_new[value] = user[key.to_s]
end end

16
lib/import/otrs2.rb
View file

@ -520,7 +520,7 @@ module Import::OTRS2
created_by_id: 1, created_by_id: 1,
updated_by_id: 1, updated_by_id: 1,
} }
map[:Ticket].each { |key,value| map[:Ticket].each { |key, value|
if record[key.to_s] && record[key.to_s].class == String if record[key.to_s] && record[key.to_s].class == String
ticket_new[value] = Encode.conv( 'utf8', record[key.to_s] ) ticket_new[value] = Encode.conv( 'utf8', record[key.to_s] )
else else
@ -571,7 +571,7 @@ module Import::OTRS2
created_by_id: 1, created_by_id: 1,
updated_by_id: 1, updated_by_id: 1,
} }
map[:Article].each { |key,value| map[:Article].each { |key, value|
if article[key.to_s] if article[key.to_s]
article_new[value] = Encode.conv( 'utf8', article[key.to_s] ) article_new[value] = Encode.conv( 'utf8', article[key.to_s] )
end end
@ -820,7 +820,7 @@ module Import::OTRS2
created_by_id: 1, created_by_id: 1,
updated_by_id: 1, updated_by_id: 1,
} }
map.each { |key,value| map.each { |key, value|
if state.has_key?(key.to_s) if state.has_key?(key.to_s)
state_new[value] = state[key.to_s] state_new[value] = state[key.to_s]
end end
@ -869,7 +869,7 @@ module Import::OTRS2
created_by_id: 1, created_by_id: 1,
updated_by_id: 1, updated_by_id: 1,
} }
map.each { |key,value| map.each { |key, value|
if priority.has_key?(key.to_s) if priority.has_key?(key.to_s)
priority_new[value] = priority[key.to_s] priority_new[value] = priority[key.to_s]
end end
@ -910,7 +910,7 @@ module Import::OTRS2
created_by_id: 1, created_by_id: 1,
updated_by_id: 1, updated_by_id: 1,
} }
map.each { |key,value| map.each { |key, value|
if group.has_key?(key.to_s) if group.has_key?(key.to_s)
group_new[value] = group[key.to_s] group_new[value] = group[key.to_s]
end end
@ -966,7 +966,7 @@ module Import::OTRS2
role_ids: role_ids, role_ids: role_ids,
group_ids: group_ids, group_ids: group_ids,
} }
map.each { |key,value| map.each { |key, value|
if user.has_key?(key.to_s) if user.has_key?(key.to_s)
user_new[value] = user[key.to_s] user_new[value] = user[key.to_s]
end end
@ -1091,7 +1091,7 @@ module Import::OTRS2
organization_id: get_organization_id(user, organizations), organization_id: get_organization_id(user, organizations),
role_ids: [ role_customer.id ], role_ids: [ role_customer.id ],
} }
map.each { |key,value| map.each { |key, value|
if user.has_key?(key.to_s) if user.has_key?(key.to_s)
user_new[value] = user[key.to_s] user_new[value] = user[key.to_s]
end end
@ -1155,7 +1155,7 @@ module Import::OTRS2
created_by_id: 1, created_by_id: 1,
updated_by_id: 1, updated_by_id: 1,
} }
map.each { |key,value| map.each { |key, value|
if organization.has_key?(key.to_s) if organization.has_key?(key.to_s)
organization_new[value] = organization[key.to_s] organization_new[value] = organization[key.to_s]
end end

2
lib/static_assets.rb
View file

@ -7,7 +7,7 @@ module StaticAssets
data[:content] = Base64.decode64($2) data[:content] = Base64.decode64($2)
return data return data
end end
raise "Unable to parse data url: #{data_url.substr(0,100)}" raise "Unable to parse data url: #{data_url.substr(0, 100)}"
end end
# store image 1:1 # store image 1:1

2
lib/user_agent.rb
View file

@ -340,7 +340,7 @@ returns
raise "Unable to process http call '#{response.inspect}'" raise "Unable to process http call '#{response.inspect}'"
end end
def self.ftp(uri,options) def self.ftp(uri, options)
host = uri.host host = uri.host
filename = File.basename(uri.path) filename = File.basename(uri.path)
remote_dir = File.dirname(uri.path) remote_dir = File.dirname(uri.path)

2
script/source_code_filter.rb
View file

@ -67,7 +67,7 @@ def checkForHeader(fileName)
end end
#folder array #folder array
folder = ['app/assets/javascripts/app','app/controllers/', 'app/models/', 'app/helpers/', 'app/mailers/' ] folder = ['app/assets/javascripts/app', 'app/controllers/', 'app/models/', 'app/helpers/', 'app/mailers/' ]
folder.each do |folder| folder.each do |folder|
puts 'Working on folder' + folder.to_s puts 'Working on folder' + folder.to_s
rbfiles = File.join("../#{folder}**", '*.{rb,coffee}') rbfiles = File.join("../#{folder}**", '*.{rb,coffee}')

2
script/websocket-server.rb
View file

@ -76,7 +76,7 @@ if ARGV[0] == 'start' && @options[:d]
Daemons.daemonize Daemons.daemonize
# create pid file # create pid file
$daemon_pid = File.new( @options[:i].to_s,'w' ) $daemon_pid = File.new( @options[:i].to_s, 'w' )
$daemon_pid.sync = true $daemon_pid.sync = true
$daemon_pid.puts(Process.pid.to_s) $daemon_pid.puts(Process.pid.to_s)
$daemon_pid.close $daemon_pid.close

2
test/integration/twitter_test.rb
View file

@ -73,7 +73,7 @@ class TwitterTest < ActiveSupport::TestCase
ticket = Ticket.create( ticket = Ticket.create(
group_id: group.id, group_id: group.id,
customer_id: user.id, customer_id: user.id,
title: text[0,40], title: text[0, 40],
state_id: state.id, state_id: state.id,
priority_id: priority.id, priority_id: priority.id,
updated_by_id: 1, updated_by_id: 1,

2
test/unit/email_process_test.rb
View file

@ -2153,7 +2153,7 @@ Some Text',
assert( false, "No user '#{user_result[:email]}' found!" ) assert( false, "No user '#{user_result[:email]}' found!" )
return return
end end
user_result.each { |key,value| user_result.each { |key, value|
if user.respond_to?( key ) if user.respond_to?( key )
assert_equal( value, user.send(key), "user check #{ key }" ) assert_equal( value, user.send(key), "user check #{ key }" )
else else

6
test/unit/ticket_notification_test.rb
View file

@ -407,7 +407,7 @@ class TicketNotificationTest < ActiveSupport::TestCase
) )
# check changed attributes # check changed attributes
human_changes = bg.human_changes(agent1,ticket1) human_changes = bg.human_changes(agent1, ticket1)
assert( human_changes['Priority'], 'Check if attributes translated based on ObjectManager::Attribute' ) assert( human_changes['Priority'], 'Check if attributes translated based on ObjectManager::Attribute' )
assert( human_changes['Pending till'], 'Check if attributes translated based on ObjectManager::Attribute' ) assert( human_changes['Pending till'], 'Check if attributes translated based on ObjectManager::Attribute' )
assert_equal( 'i18n(1 low)', human_changes['Priority'][0] ) assert_equal( 'i18n(1 low)', human_changes['Priority'][0] )
@ -511,7 +511,7 @@ class TicketNotificationTest < ActiveSupport::TestCase
puts "hc #{human_changes.inspect}" puts "hc #{human_changes.inspect}"
# check changed attributes # check changed attributes
human_changes = bg.human_changes(agent1,ticket1) human_changes = bg.human_changes(agent1, ticket1)
assert( human_changes['Title'], 'Check if attributes translated based on ObjectManager::Attribute' ) assert( human_changes['Title'], 'Check if attributes translated based on ObjectManager::Attribute' )
assert( human_changes['Priority'], 'Check if attributes translated based on ObjectManager::Attribute' ) assert( human_changes['Priority'], 'Check if attributes translated based on ObjectManager::Attribute' )
assert_equal( 'i18n(2 normal)', human_changes['Priority'][0] ) assert_equal( 'i18n(2 normal)', human_changes['Priority'][0] )
@ -522,7 +522,7 @@ class TicketNotificationTest < ActiveSupport::TestCase
assert_not( human_changes['pending_time'] ) assert_not( human_changes['pending_time'] )
assert_not( human_changes['pending_till'] ) assert_not( human_changes['pending_till'] )
human_changes = bg.human_changes(agent2,ticket1) human_changes = bg.human_changes(agent2, ticket1)
puts "hc2 #{human_changes.inspect}" puts "hc2 #{human_changes.inspect}"
template = bg.template_update(agent1, ticket1, article, human_changes) template = bg.template_update(agent1, ticket1, article, human_changes)