From 95c99c0c674d8d52da070fb773a21ee2de4a4dbd Mon Sep 17 00:00:00 2001 From: rkaldung Date: Mon, 8 Sep 2014 20:53:32 +0200 Subject: [PATCH 1/3] fixed typoe --- .../app/controllers/_application_controller_form.js.coffee | 2 +- .../javascripts/app/controllers/agent_ticket_create.js.coffee | 2 +- db/seeds.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee index 56450de6b..6aabe7210 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee @@ -82,7 +82,7 @@ class App.ControllerForm extends App.Controller null: false relation: 'User' autocapitalize: false - help: 'Select the customer of the Ticket or create one.' + help: 'Select the customer of the ticket or create one.' helpLink: '»' callback: @userInfo class: 'span7' diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee index 5bb518847..44212542b 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee @@ -150,7 +150,7 @@ class App.TicketCreate extends App.Controller # generate form configure_attributes = [ - { name: 'customer_id', display: 'Customer', tag: 'autocompletion', type: 'text', limit: 200, null: false, relation: 'User', class: 'span7', autocapitalize: false, help: 'Select the customer of the Ticket or create one.', helpLink: '»', callback: @localUserInfo, source: @apiPath + '/users/search', minLengt: 2 }, + { name: 'customer_id', display: 'Customer', tag: 'autocompletion', type: 'text', limit: 200, null: false, relation: 'User', class: 'span7', autocapitalize: false, help: 'Select the customer of the ticket or create one.', helpLink: '»', callback: @localUserInfo, source: @apiPath + '/users/search', minLengt: 2 }, { name: 'group_id', display: 'Group', tag: 'select', multiple: false, null: false, filter: @edit_form, nulloption: true, relation: 'Group', default: defaults['group_id'], class: 'span7', }, { name: 'owner_id', display: 'Owner', tag: 'select', multiple: false, null: true, filter: @edit_form, nulloption: true, relation: 'User', default: defaults['owner_id'], class: 'span7', }, { name: 'tags', display: 'Tags', tag: 'tag', type: 'text', null: true, default: defaults['tags'], class: 'span7', }, diff --git a/db/seeds.rb b/db/seeds.rb index 912ae2ec2..382b385a6 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1683,7 +1683,7 @@ Translation.create_if_not_exists( :locale => 'de', :source => "Direction", :targ Translation.create_if_not_exists( :locale => 'de', :source => "Owner", :target => "Besitzer" ) Translation.create_if_not_exists( :locale => 'de', :source => "Subject", :target => "Betreff" ) Translation.create_if_not_exists( :locale => 'de', :source => "Priority", :target => "Priorität" ) -Translation.create_if_not_exists( :locale => 'de', :source => "Select the customer of the Ticket or create one.", :target => "Wähle den Kundn f�r das Ticket oder erstell einen neuen." ) +Translation.create_if_not_exists( :locale => 'de', :source => "Select the customer of the ticket or create one.", :target => "Wähle den Kunden f�r das Ticket oder erstelle einen Neuen." ) Translation.create_if_not_exists( :locale => 'de', :source => "New Ticket", :target => "Neues Ticket" ) Translation.create_if_not_exists( :locale => 'de', :source => "Firstname", :target => "Vorname" ) Translation.create_if_not_exists( :locale => 'de', :source => "Lastname", :target => "Nachname" ) From 675be2e5abe0552e3e593d6f9a371607430291cf Mon Sep 17 00:00:00 2001 From: rkaldung Date: Mon, 8 Sep 2014 20:59:17 +0200 Subject: [PATCH 2/3] more typos fixed --- app/assets/javascripts/app/models/group.js.coffee | 4 ++-- db/seeds.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/app/models/group.js.coffee b/app/assets/javascripts/app/models/group.js.coffee index 7ad3f1be6..b07a43791 100644 --- a/app/assets/javascripts/app/models/group.js.coffee +++ b/app/assets/javascripts/app/models/group.js.coffee @@ -5,7 +5,7 @@ class App.Group extends App.Model @configure_attributes = [ { name: 'name', display: 'Name', tag: 'input', type: 'text', limit: 100, 'null': false, 'class': 'span4' }, - { name: 'assignment_timeout', display: 'Assignment Timout', tag: 'input', note: 'Assignment timout in minutes if assigned agent is not working on it. Ticket will be shown as unassigend.', type: 'text', limit: 100, 'null': true, 'class': 'span4' }, + { name: 'assignment_timeout', display: 'Assignment Timeout', tag: 'input', note: 'Assignment timeout in minutes if assigned agent is not working on it. Ticket will be shown as unassigend.', type: 'text', limit: 100, 'null': true, 'class': 'span4' }, { name: 'follow_up_possible', display: 'Follow up possible',tag: 'select', default: 'yes', options: { yes: 'yes', reject: 'reject follow up/do not reopen Ticket', 'new_ticket': 'do not reopen Ticket but create new Ticket' }, 'null': false, note: 'Follow up for closed ticket possible or not.', 'class': 'span4' }, { name: 'follow_up_assignment', display: 'Assign Follow Ups', tag: 'select', default: 'yes', options: { true: 'yes', false: 'no' }, 'null': false, note: 'Assign follow up to latest agent again.', 'class': 'span4' }, { name: 'email_address_id', display: 'Email', tag: 'select', multiple: false, null: true, relation: 'EmailAddress', nulloption: true, class: 'span4' }, @@ -19,4 +19,4 @@ class App.Group extends App.Model ] uiUrl: -> - '#group/zoom/' + @id \ No newline at end of file + '#group/zoom/' + @id diff --git a/db/seeds.rb b/db/seeds.rb index 382b385a6..8a62080f0 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1756,7 +1756,7 @@ Translation.create_if_not_exists( :locale => 'de', :source => "Forgot your passw Translation.create_if_not_exists( :locale => 'de', :source => "Templates", :target => "Vorlagen" ) Translation.create_if_not_exists( :locale => 'de', :source => "Delete", :target => "Löschen" ) Translation.create_if_not_exists( :locale => 'de', :source => "Apply", :target => "Übernehmen" ) -Translation.create_if_not_exists( :locale => 'de', :source => "Save as Template", :target => "Als Template speichern" ) +Translation.create_if_not_exists( :locale => 'de', :source => "Save as Template", :target => "Als Vorlage speichern" ) Translation.create_if_not_exists( :locale => 'de', :source => "Save", :target => "Speichern" ) Translation.create_if_not_exists( :locale => 'de', :source => "Open Tickets", :target => "Offene Ticket" ) Translation.create_if_not_exists( :locale => 'de', :source => "Closed Tickets", :target => "Geschlossene Ticket" ) @@ -1771,7 +1771,7 @@ Translation.create_if_not_exists( :locale => 'de', :source => "3 high", :target Translation.create_if_not_exists( :locale => 'de', :source => "public", :target => "öffentlich" ) Translation.create_if_not_exists( :locale => 'de', :source => "internal", :target => "intern" ) Translation.create_if_not_exists( :locale => 'de', :source => "Attach files", :target => "Dateien anhängen" ) -Translation.create_if_not_exists( :locale => 'de', :source => "Visability", :target => "Sichtbarkeit" ) +Translation.create_if_not_exists( :locale => 'de', :source => "Visibility", :target => "Sichtbarkeit" ) Translation.create_if_not_exists( :locale => 'de', :source => "Actions", :target => "Aktionen" ) Translation.create_if_not_exists( :locale => 'de', :source => "Email", :target => "E-Mail" ) Translation.create_if_not_exists( :locale => 'de', :source => "email", :target => "E-Mail" ) @@ -1791,7 +1791,7 @@ Translation.create_if_not_exists( :locale => 'de', :source => "Change Customer", Translation.create_if_not_exists( :locale => 'de', :source => "My Tickets", :target => "Meine Tickets" ) Translation.create_if_not_exists( :locale => 'de', :source => "My Organization Tickets", :target => "Meine Organisations Tickets" ) Translation.create_if_not_exists( :locale => 'de', :source => "My Organization", :target => "Meine Organisation" ) -Translation.create_if_not_exists( :locale => 'de', :source => "Assignment Timout", :target => "Zeitliche Zuweisungsüberschritung" ) +Translation.create_if_not_exists( :locale => 'de', :source => "Assignment Timeout", :target => "Zeitliche Zuweisungsüberschritung" ) Translation.create_if_not_exists( :locale => 'de', :source => "We've sent password reset instructions to your email address.", :target => "Wir haben Ihnen die Anleitung zum zurücksetzen Ihres Passworts an Ihre E-Mail-Adresse gesendet." ) Translation.create_if_not_exists( :locale => 'de', :source => "Enter your username or email address", :target => "Bitte geben Sie Ihren Benutzernamen oder E-Mail-Adresse ein" ) Translation.create_if_not_exists( :locale => 'de', :source => "Choose your new password.", :target => "Wählen Sie Ihr neues Passwort." ) From 6fbc3f69f79ed622970a62b4ede76779771848be Mon Sep 17 00:00:00 2001 From: rkaldung Date: Mon, 8 Sep 2014 21:15:39 +0200 Subject: [PATCH 3/3] added test --- test/unit/tag_test.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/unit/tag_test.rb b/test/unit/tag_test.rb index 5a8b2100f..4aa21c49e 100644 --- a/test/unit/tag_test.rb +++ b/test/unit/tag_test.rb @@ -74,6 +74,23 @@ class TagTest < ActiveSupport::TestCase }, }, + # test 5 + { + :tag_remove => { + :item => 'tag1', + :object => 'Object1', + :o_id => 123, + :created_by_id => 1 + }, + :verify => { + :object => 'Object1', + :items => { + 'tag1' => false, + 'tag2' => true, + }, + }, + }, + ] tests.each { |test| success = Tag.tag_add( test[:tag_add] )