Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix bug on email separator #792

Merged
merged 2 commits into from
Jun 20, 2024
Merged

fix bug on email separator #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa9b7c5
fix bug on email separator
denis99999 Jun 20, 2024
6b31970
Merge branch 'DeviceFarmer:master' into fix-bug-on-email-separator
denis99999 Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions res/app/group-list/group-list-controller.js
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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