From 39578cea49ee9c2910e5128811209e071d9ee90e Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Fri, 1 May 2015 14:27:57 +0200 Subject: [PATCH] Corrected with rubocop cop 'Style/MultilineOperationIndentation'. --- app/models/activity_stream.rb | 8 ++--- app/models/channel/email_parser.rb | 2 +- app/models/history.rb | 4 +-- app/models/job.rb | 4 +-- app/models/observer/ticket/last_contact.rb | 6 ++-- app/models/online_notification.rb | 9 +++--- app/models/recent_view.rb | 8 ++--- app/models/store.rb | 6 ++-- app/models/ticket.rb | 6 ++-- app/models/ticket/overviews.rb | 34 +++++++++++----------- app/models/token.rb | 2 +- lib/import/otrs.rb | 2 +- lib/import/otrs2.rb | 2 +- 13 files changed, 48 insertions(+), 45 deletions(-) diff --git a/app/models/activity_stream.rb b/app/models/activity_stream.rb index d5806acc9..582a79e77 100644 --- a/app/models/activity_stream.rb +++ b/app/models/activity_stream.rb @@ -99,12 +99,12 @@ return all activity entries of an user return [] if role_ids.include?(customer_role.id) if group_ids.empty? stream = ActivityStream.where('(role_id IN (?) AND group_id is NULL)', role_ids ) - .order( 'created_at DESC, id DESC' ) - .limit( limit ) + .order( 'created_at DESC, id DESC' ) + .limit( limit ) else stream = ActivityStream.where('(role_id IN (?) AND group_id is NULL) OR ( role_id IN (?) AND group_id IN (?) ) OR ( role_id is NULL AND group_id IN (?) )', role_ids, role_ids, group_ids, group_ids ) - .order( 'created_at DESC, id DESC' ) - .limit( limit ) + .order( 'created_at DESC, id DESC' ) + .limit( limit ) end list = [] stream.each do |item| diff --git a/app/models/channel/email_parser.rb b/app/models/channel/email_parser.rb index 57c5c0230..33a5f3e90 100644 --- a/app/models/channel/email_parser.rb +++ b/app/models/channel/email_parser.rb @@ -103,7 +103,7 @@ class Channel::EmailParser data[:from_local] = Mail::Address.new( from ).local data[:from_domain] = Mail::Address.new( from ).domain data[:from_display_name] = Mail::Address.new( from ).display_name || - ( Mail::Address.new( from ).comments && Mail::Address.new( from ).comments[0] ) + ( Mail::Address.new( from ).comments && Mail::Address.new( from ).comments[0] ) rescue data[:from_email] = from data[:from_local] = from diff --git a/app/models/history.rb b/app/models/history.rb index f3de58535..65bca3295 100644 --- a/app/models/history.rb +++ b/app/models/history.rb @@ -151,8 +151,8 @@ returns if !related_history_object history_object = self.object_lookup( requested_object ) history = History.where( history_object_id: history_object.id ) - .where( o_id: requested_object_id ) - .order('created_at ASC, id ASC') + .where( o_id: requested_object_id ) + .order('created_at ASC, id ASC') else history_object_requested = self.object_lookup( requested_object ) history_object_related = self.object_lookup( related_history_object ) diff --git a/app/models/job.rb b/app/models/job.rb index 4bf4b7d45..7a3386e7f 100644 --- a/app/models/job.rb +++ b/app/models/job.rb @@ -43,8 +43,8 @@ class Job < ApplicationModel # find tickets to change tickets = Ticket.where( job.condition.permit! ) - .order( '`tickets`.`created_at` DESC' ) - .limit( 1_000 ) + .order( '`tickets`.`created_at` DESC' ) + .limit( 1_000 ) job.processed = tickets.count tickets.each do |ticket| #puts "CHANGE #{job.execute.inspect}" diff --git a/app/models/observer/ticket/last_contact.rb b/app/models/observer/ticket/last_contact.rb index 0bc8e7682..f7418b05e 100644 --- a/app/models/observer/ticket/last_contact.rb +++ b/app/models/observer/ticket/last_contact.rb @@ -18,8 +18,10 @@ class Observer::Ticket::LastContact < ActiveRecord::Observer # check if last communication is done by agent, else do not set last_contact_customer if record.ticket.last_contact_customer == nil || - record.ticket.last_contact_agent == nil || - record.ticket.last_contact_agent.to_i > record.ticket.last_contact_customer.to_i + record.ticket.last_contact_agent == nil || + record.ticket.last_contact_agent.to_i > record.ticket.last_contact_customer.to_i + + # set last_contact customer record.ticket.last_contact_customer = record.created_at # set last_contact diff --git a/app/models/online_notification.rb b/app/models/online_notification.rb index a73aedc72..53ad3a120 100644 --- a/app/models/online_notification.rb +++ b/app/models/online_notification.rb @@ -88,8 +88,8 @@ return all online notifications of an user def self.list(user, limit) notifications = OnlineNotification.where(user_id: user.id) - .order( 'created_at DESC, id DESC' ) - .limit( limit ) + .order( 'created_at DESC, id DESC' ) + .limit( limit ) list = [] notifications.each do |item| data = item.attributes @@ -116,8 +116,9 @@ return all online notifications of an object object_lookup_id: object_id, o_id: o_id, ) - .order( 'created_at DESC, id DESC' ) - .limit( 10_000 ) + .order( 'created_at DESC, id DESC' ) + .limit( 10_000 ) + list = [] notifications.each do |item| data = item.attributes diff --git a/app/models/recent_view.rb b/app/models/recent_view.rb index 9c3c3915d..5db403034 100644 --- a/app/models/recent_view.rb +++ b/app/models/recent_view.rb @@ -38,12 +38,12 @@ class RecentView < ApplicationModel def self.list( user, limit = 10, type = nil ) if !type recent_views = RecentView.where( created_by_id: user.id ) - .order('created_at DESC, id DESC') - .limit(limit) + .order('created_at DESC, id DESC') + .limit(limit) else recent_views = RecentView.select('DISTINCT(o_id), recent_view_object_id').where( created_by_id: user.id, recent_view_object_id: ObjectLookup.by_name(type) ) - .order('created_at DESC, id DESC') - .limit(limit) + .order('created_at DESC, id DESC') + .limit(limit) end list = [] diff --git a/app/models/store.rb b/app/models/store.rb index f907efebc..d943ae969 100644 --- a/app/models/store.rb +++ b/app/models/store.rb @@ -81,7 +81,7 @@ returns # search store_object_id = Store::Object.lookup( name: data[:object] ) stores = Store.where( store_object_id: store_object_id, o_id: data[:o_id].to_i ) - .order('created_at ASC, id ASC') + .order('created_at ASC, id ASC') stores end @@ -104,8 +104,8 @@ returns # search store_object_id = Store::Object.lookup( name: data[:object] ) stores = Store.where( store_object_id: store_object_id ) - .where( o_id: data[:o_id] ) - .order('created_at ASC, id ASC') + .where( o_id: data[:o_id] ) + .order('created_at ASC, id ASC') stores.each do |store| # check backend for references diff --git a/app/models/ticket.rb b/app/models/ticket.rb index 9698eebd1..c21c1e47e 100644 --- a/app/models/ticket.rb +++ b/app/models/ticket.rb @@ -95,9 +95,9 @@ returns access_condition = [] if user.is_role(Z_ROLENAME_AGENT) group_ids = Group.select( 'groups.id' ).joins(:users) - .where( 'groups_users.user_id = ?', user.id ) - .where( 'groups.active = ?', true ) - .map( &:id ) + .where( 'groups_users.user_id = ?', user.id ) + .where( 'groups.active = ?', true ) + .map( &:id ) access_condition = [ 'group_id IN (?)', group_ids ] else if !user.organization || ( !user.organization.shared || user.organization.shared == false ) diff --git a/app/models/ticket/overviews.rb b/app/models/ticket/overviews.rb index 7488102f6..36bd20290 100644 --- a/app/models/ticket/overviews.rb +++ b/app/models/ticket/overviews.rb @@ -109,13 +109,13 @@ returns # get only tickets with permissions if data[:current_user].is_role('Customer') group_ids = Group.select( 'groups.id' ) - .where( 'groups.active = ?', true ) - .map( &:id ) + .where( 'groups.active = ?', true ) + .map( &:id ) else group_ids = Group.select( 'groups.id' ).joins(:users) - .where( 'groups_users.user_id = ?', [ data[:current_user].id ] ) - .where( 'groups.active = ?', true ) - .map( &:id ) + .where( 'groups_users.user_id = ?', [ data[:current_user].id ] ) + .where( 'groups.active = ?', true ) + .map( &:id ) end # overview meta for navbar @@ -148,10 +148,10 @@ returns order_by = overview_selected.group_by + '_id, ' + order_by end tickets = Ticket.select( 'id' ) - .where( group_id: group_ids ) - .where( _condition( overview_selected.condition ) ) - .order( order_by ) - .limit( 500 ) + .where( group_id: group_ids ) + .where( _condition( overview_selected.condition ) ) + .order( order_by ) + .limit( 500 ) ticket_ids = [] tickets.each { |ticket| @@ -159,8 +159,8 @@ returns } tickets_count = Ticket.where( group_id: group_ids ) - .where( _condition( overview_selected.condition ) ) - .count() + .where( _condition( overview_selected.condition ) ) + .count() return { ticket_ids: ticket_ids, @@ -172,14 +172,14 @@ returns # get tickets for overview data[:start_page] ||= 1 tickets = Ticket.where( group_id: group_ids ) - .where( _condition( overview_selected.condition ) ) - .order( overview_selected[:order][:by].to_s + ' ' + overview_selected[:order][:direction].to_s )#. - # limit( overview_selected.view[ data[:view_mode].to_sym ][:per_page] ). - # offset( overview_selected.view[ data[:view_mode].to_sym ][:per_page].to_i * ( data[:start_page].to_i - 1 ) ) + .where( _condition( overview_selected.condition ) ) + .order( overview_selected[:order][:by].to_s + ' ' + overview_selected[:order][:direction].to_s ) + # .limit( overview_selected.view[ data[:view_mode].to_sym ][:per_page] ) + # .offset( overview_selected.view[ data[:view_mode].to_sym ][:per_page].to_i * ( data[:start_page].to_i - 1 ) ) tickets_count = Ticket.where( group_id: group_ids ) - .where( _condition( overview_selected.condition ) ) - .count() + .where( _condition( overview_selected.condition ) ) + .count() { tickets: tickets, diff --git a/app/models/token.rb b/app/models/token.rb index ff615d0aa..0f92da53f 100644 --- a/app/models/token.rb +++ b/app/models/token.rb @@ -13,7 +13,7 @@ class Token < ActiveRecord::Base # check if token is still valid if !token.persistent && - token.created_at < 1.day.ago + token.created_at < 1.day.ago # delete token token.delete diff --git a/lib/import/otrs.rb b/lib/import/otrs.rb index a17dd3819..f28fc0e3b 100644 --- a/lib/import/otrs.rb +++ b/lib/import/otrs.rb @@ -352,7 +352,7 @@ module Import::OTRS if !user begin display_name = Mail::Address.new( article_new[:from] ).display_name || - ( Mail::Address.new( article_new[:from] ).comments && Mail::Address.new( article_new[:from] ).comments[0] ) + ( Mail::Address.new( article_new[:from] ).comments && Mail::Address.new( article_new[:from] ).comments[0] ) rescue display_name = article_new[:from] end diff --git a/lib/import/otrs2.rb b/lib/import/otrs2.rb index 175f7296c..42874f7b9 100644 --- a/lib/import/otrs2.rb +++ b/lib/import/otrs2.rb @@ -1296,7 +1296,7 @@ module Import::OTRS2 # unlock user locks[:User][ email ] = false - + true end