Skip to content

Commit

Permalink
fix bug on email separator (DeviceFarmer#792)
Browse files Browse the repository at this point in the history
Signed-off-by: Denis barbaron <denis.barbaron@orange.com>
  • Loading branch information
denis99999 authored and michal-murin committed Jan 28, 2025
1 parent fbd7b64 commit dda49e5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions res/app/group-list/group-list-controller.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright © 2019 code initially contributed by Orange SA, authors: Denis Barbaron - Licensed under the Apache license 2.0
* Copyright © 2019-2024 code initially contributed by Orange SA, authors: Denis Barbaron - Licensed under the Apache license 2.0
**/

const _ = require('lodash')
Expand Down Expand Up @@ -357,7 +357,7 @@ module.exports = function GroupListCtrl(
CommonService.copyToClipboard(_.uniq(groups.map(function(group) {
return group.owner.email
}))
.join(SettingsService.get('emailSeparator')))
.join(SettingsService.get('emailAddressSeparator')))
.url('mailto:?body=*** Paste the email addresses from the clipboard! ***')
}

Expand All @@ -366,7 +366,7 @@ module.exports = function GroupListCtrl(
CommonService.copyToClipboard(users.map(function(user) {
return user.email
})
.join(SettingsService.get('emailSeparator')))
.join(SettingsService.get('emailAddressSeparator')))
.url('mailto:?body=*** Paste the email addresses from the clipboard! ***')
}

Expand Down
6 changes: 3 additions & 3 deletions res/app/settings/groups/groups-controller.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright © 2019 code initially contributed by Orange SA, authors: Denis Barbaron - Licensed under the Apache license 2.0
* Copyright © 2019-2024 code initially contributed by Orange SA, authors: Denis Barbaron - Licensed under the Apache license 2.0
**/

const _ = require('lodash')
Expand Down Expand Up @@ -330,7 +330,7 @@ module.exports = function GroupsCtrl(
CommonService.copyToClipboard(_.uniq(groups.map(function(group) {
return group.owner.email
}))
.join(SettingsService.get('emailSeparator')))
.join(SettingsService.get('emailAddressSeparator')))
.url('mailto:?body=*** Paste the email addresses from the clipboard! ***')
}

Expand All @@ -343,7 +343,7 @@ module.exports = function GroupsCtrl(
CommonService.copyToClipboard(users.map(function(user) {
return user.email
})
.join(SettingsService.get('emailSeparator')))
.join(SettingsService.get('emailAddressSeparator')))
.url('mailto:?body=*** Paste the email addresses from the clipboard! ***')
}

Expand Down
4 changes: 2 additions & 2 deletions res/app/settings/users/users-controller.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright © 2019 code initially contributed by Orange SA, authors: Denis Barbaron - Licensed under the Apache license 2.0
* Copyright © 2019-2024 code initially contributed by Orange SA, authors: Denis Barbaron - Licensed under the Apache license 2.0
**/

const _ = require('lodash')
Expand Down Expand Up @@ -83,7 +83,7 @@ module.exports = function UsersCtrl(
CommonService.copyToClipboard(users.map(function(user) {
return user.email
})
.join(SettingsService.get('emailSeparator')))
.join(SettingsService.get('emailAddressSeparator')))
.url('mailto:?body=*** Paste the email addresses from the clipboard! ***')
}

Expand Down

0 comments on commit dda49e5

Please sign in to comment.