Skip to content

Commit 8757308

Browse files
authored
fix bug on email separator (DeviceFarmer#792)
Signed-off-by: Denis barbaron <denis.barbaron@orange.com>
1 parent dfb4ebe commit 8757308

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

res/app/group-list/group-list-controller.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2019 code initially contributed by Orange SA, authors: Denis Barbaron - Licensed under the Apache license 2.0
2+
* Copyright © 2019-2024 code initially contributed by Orange SA, authors: Denis Barbaron - Licensed under the Apache license 2.0
33
**/
44

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

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

res/app/settings/groups/groups-controller.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2019 code initially contributed by Orange SA, authors: Denis Barbaron - Licensed under the Apache license 2.0
2+
* Copyright © 2019-2024 code initially contributed by Orange SA, authors: Denis Barbaron - Licensed under the Apache license 2.0
33
**/
44

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

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

res/app/settings/users/users-controller.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2019 code initially contributed by Orange SA, authors: Denis Barbaron - Licensed under the Apache license 2.0
2+
* Copyright © 2019-2024 code initially contributed by Orange SA, authors: Denis Barbaron - Licensed under the Apache license 2.0
33
**/
44

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

0 commit comments

Comments
 (0)