Add QR codes to access data list (fixes #2665)
This commit is contained in:
parent
85c70b27f5
commit
9abf9d5d57
@ -66,6 +66,7 @@ Users:
|
|||||||
- Added new field 'is_committee' and new default group 'Committees'.
|
- Added new field 'is_committee' and new default group 'Committees'.
|
||||||
- Improved users CSV import (use group names instead of id).
|
- Improved users CSV import (use group names instead of id).
|
||||||
- Added more multiselect actions.
|
- Added more multiselect actions.
|
||||||
|
- Added QR code in users access pdf.
|
||||||
|
|
||||||
Other:
|
Other:
|
||||||
- Django 1.10 is now supported. Dropped support for Django 1.8 and 1.9.
|
- Django 1.10 is now supported. Dropped support for Django 1.8 and 1.9.
|
||||||
|
@ -128,6 +128,9 @@ angular.module('OpenSlidesApp.users.pdf', ['OpenSlidesApp.core.pdf'])
|
|||||||
};
|
};
|
||||||
|
|
||||||
var createAccessDataContent = function(user) {
|
var createAccessDataContent = function(user) {
|
||||||
|
var wifiQrCode = "WIFI:S:" + Config.get('users_pdf_wlan_ssid').value +
|
||||||
|
";T:" + Config.get('users_pdf_wlan_encryption').value +
|
||||||
|
";P:" + Config.get('users_pdf_wlan_password').value + ";;";
|
||||||
var accessDataColumns = {
|
var accessDataColumns = {
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
@ -160,6 +163,15 @@ angular.module('OpenSlidesApp.users.pdf', ['OpenSlidesApp.core.pdf'])
|
|||||||
text: Config.get('users_pdf_wlan_encryption').value || '-',
|
text: Config.get('users_pdf_wlan_encryption').value || '-',
|
||||||
style: 'userDataValue'
|
style: 'userDataValue'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
text: "\n"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
qr: wifiQrCode
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: gettextCatalog.getString("scan QR code to connect to WLAN")
|
||||||
|
},
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -193,6 +205,15 @@ angular.module('OpenSlidesApp.users.pdf', ['OpenSlidesApp.core.pdf'])
|
|||||||
link: Config.get('users_pdf_url').value,
|
link: Config.get('users_pdf_url').value,
|
||||||
style: 'userDataValue'
|
style: 'userDataValue'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
text: "\n"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
qr: Config.get('users_pdf_url').value
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: gettextCatalog.getString("scan QR code to open the URL")
|
||||||
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
Loading…
Reference in New Issue
Block a user