From b8b2a6b7628ce398fe5889b91f6b3661721112c5 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 6 Aug 2015 18:19:31 +0200 Subject: [PATCH] user merge layout ref alpha has: - multiple email support (on both sides) - merge controls misses: - user select --- .../app/controllers/layout_ref.js.coffee | 48 + .../app/views/layout_ref/index.jst.eco | 1 + .../views/layout_ref/merge_customer.jst.eco | 118 ++ .../layout_ref/merge_customer_view.jst.eco | 1001 +++++++++++++++++ app/assets/stylesheets/svg-dimensions.css | 2 + app/assets/stylesheets/zammad.css.scss | 161 +++ contrib/icon-sprite.sketch | Bin 1310720 -> 1327104 bytes public/assets/images/icons.svg | 2 +- .../assets/images/icons/line-left-arrow.svg | 13 + .../assets/images/icons/line-right-arrow.svg | 13 + 10 files changed, 1358 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/app/views/layout_ref/merge_customer.jst.eco create mode 100644 app/assets/javascripts/app/views/layout_ref/merge_customer_view.jst.eco create mode 100644 public/assets/images/icons/line-left-arrow.svg create mode 100644 public/assets/images/icons/line-right-arrow.svg diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index aef80a862..55616d440 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -1533,5 +1533,53 @@ class ButtonsRef extends App.ControllerContent App.Config.set( 'layout_ref/buttons', ButtonsRef, 'Routes' ) +class mergeCustomerRef extends App.ControllerContent + + mergeTarget: + firstname: 'Nicole', + lastname: 'Braun', + email: [ + { + address: 'nicole.braun@zammad.com' + main: true + } + ] + + mergeSource: + firstname: 'Nicole', + lastname: 'Müller', + email: [ + { + address: 'nicole.mueller@zammad.com' + main: true + }, + { + address: 'nicole@mueller.de' + } + ] + + events: + 'change .merge-control select': 'onChange' + + constructor: -> + super + @render() + + render: -> + @html App.view('layout_ref/merge_customer_view') + + new App.ControllerModal + head: "Merge #{@mergeSource.firstname} #{@mergeSource.lastname}" + content: App.view('layout_ref/merge_customer')() + button: 'Merge' + shown: true + cancel: true + container: @el + + onChange: -> + + +App.Config.set( 'layout_ref/merge_customer', mergeCustomerRef, 'Routes' ) + App.Config.set( 'LayoutRef', { prio: 1700, parent: '#current_user', name: 'Layout Reference', translate: true, target: '#layout_ref', role: [ 'Admin' ] }, 'NavBarRight' ) \ No newline at end of file diff --git a/app/assets/javascripts/app/views/layout_ref/index.jst.eco b/app/assets/javascripts/app/views/layout_ref/index.jst.eco index 9de1dfa60..16801a592 100644 --- a/app/assets/javascripts/app/views/layout_ref/index.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/index.jst.eco @@ -4,6 +4,7 @@