Merge branch 'develop' of github.com:martini/zammad into develop
Conflicts: app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee
This commit is contained in:
Martin Edenhofer
commit
8cefe27d5e
4 changed files with 24 additions and 7 deletions
|
|
@ -111,7 +111,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: '<a href="" class="customer_new">»</a>'
|
||||
callback: @userInfo
|
||||
class: 'span7'
|
||||
|
|
|
|||
|
|
@ -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
|
||||
'#group/zoom/' + @id
|
||||
|
|
|
|||
|
|
@ -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" )
|
||||
|
|
@ -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." )
|
||||
|
|
|
|||
|
|
@ -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] )
|
||||
|
|
|
|||
Loading…
Reference in a new issue