diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee index 65546c3a6..41ef4e30c 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee @@ -163,9 +163,12 @@ class App.Controller extends Spine.Controller if name name = name + ' ' name = name + item.lastname - + + name_new = name + if attribute.translate + name_new = T(name) attribute.options.push { - name: name, + name: name_new, value: item.id, note: item.note, } 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 d7fbf680b..afbfe6299 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee @@ -3,9 +3,9 @@ $ = jQuery.sub() class Index extends App.Controller events: 'click .customer_new': 'user_new' - 'submit form': 'submit', - 'click .submit': 'submit', - 'click .cancel': 'cancel', + 'submit form': 'submit', + 'click .submit': 'submit', + 'click .cancel': 'cancel', constructor: -> super @@ -68,8 +68,8 @@ class Index extends App.Controller { 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: 'subject', display: 'Subject', tag: 'input', type: 'text', limit: 100, null: false, default: defaults['subject'], class: 'span7', }, { name: 'body', display: 'Text', tag: 'textarea', rows: 6, null: false, default: defaults['body'], class: 'span7', }, - { name: 'ticket_state_id', display: 'State', tag: 'select', multiple: false, null: false, filter: @edit_form, relation: 'TicketState', default: defaults['ticket_state_id'], class: 'medium' }, - { name: 'ticket_priority_id', display: 'Priority', tag: 'select', multiple: false, null: false, filter: @edit_form, relation: 'TicketPriority', default: defaults['ticket_priority_id'], class: 'medium' }, + { name: 'ticket_state_id', display: 'State', tag: 'select', multiple: false, null: false, filter: @edit_form, relation: 'TicketState', default: defaults['ticket_state_id'], translate: true, class: 'medium' }, + { name: 'ticket_priority_id', display: 'Priority', tag: 'select', multiple: false, null: false, filter: @edit_form, relation: 'TicketPriority', default: defaults['ticket_priority_id'], translate: true, class: 'medium' }, ] @html App.view('agent_ticket_create')( head: 'New Ticket', @@ -188,7 +188,7 @@ class UserNew extends App.ControllerModal user = new App.User # find role_id - role = App.Role.findByAttribute("name", "Customer") + role = App.Role.findByAttribute( 'name', 'Customer' ) params.role_ids = role.id @log 'updateAttributes', params user.load(params) diff --git a/app/assets/javascripts/app/controllers/navigation.js.coffee b/app/assets/javascripts/app/controllers/navigation.js.coffee index 4c16bd56c..e72f92364 100644 --- a/app/assets/javascripts/app/controllers/navigation.js.coffee +++ b/app/assets/javascripts/app/controllers/navigation.js.coffee @@ -176,7 +176,7 @@ class App.Navigation extends App.Controller Config.NavBar['TicketOverview' + item.url] = { prio: item.prio, parent: '#ticket/view', - name: item.name + ' (' + item.count + ')', + name: T(item.name) + ' (' + item.count + ')', target: '#ticket/view/' + item.url, role: ['Agent'], } diff --git a/app/assets/javascripts/app/controllers/template.js.coffee b/app/assets/javascripts/app/controllers/template.js.coffee index 35358fdaa..7320d0697 100644 --- a/app/assets/javascripts/app/controllers/template.js.coffee +++ b/app/assets/javascripts/app/controllers/template.js.coffee @@ -11,11 +11,9 @@ class App.TemplateUI extends App.Controller # fetch item on demand fetch_needed = 1 -# if App.User.exists(@user_id) -# @user = App.User.find(@user_id) -# @log 'exists', @user -# fetch_needed = 0 -# @render() + if App.Template.count() > 0 + fetch_needed = 0 + @render() if fetch_needed @reload() @@ -50,9 +48,10 @@ class App.TemplateUI extends App.Controller # get params params = @formParam(e.target) template = App.Template.find( params['template_id'] ) - template.destroy() - @template_id = undefined - @render() + if confirm('Sure?') + template.destroy() + @template_id = undefined + @render() select: (e) => e.preventDefault() diff --git a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco index 285645635..c2a1a4dee 100644 --- a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco @@ -1,5 +1,5 @@
<%= note %>
+<%= T(note) %>
<% end %> <% if @buttons: %> <% for button in @buttons: %> - + <% end %> <% end %> diff --git a/app/assets/javascripts/app/views/generic/admin/new.jst.eco b/app/assets/javascripts/app/views/generic/admin/new.jst.eco index d6bf2490a..77ed8c6f0 100644 --- a/app/assets/javascripts/app/views/generic/admin/new.jst.eco +++ b/app/assets/javascripts/app/views/generic/admin/new.jst.eco @@ -1,13 +1,13 @@ diff --git a/app/assets/javascripts/app/views/generic/admin_level2/index.jst.eco b/app/assets/javascripts/app/views/generic/admin_level2/index.jst.eco index 279e297a6..3d1b1f269 100644 --- a/app/assets/javascripts/app/views/generic/admin_level2/index.jst.eco +++ b/app/assets/javascripts/app/views/generic/admin_level2/index.jst.eco @@ -1,5 +1,5 @@