Index: umc/python/computerroom/__init__.py =================================================================== --- umc/python/computerroom/__init__.py (Revision 75565) +++ umc/python/computerroom/__init__.py (Arbeitskopie) @@ -635,7 +635,7 @@ _updateRoomInfo(self._italc.roomDN, exam=exam, examDescription=examDescription, examEndTime=examEndTime) @sanitize( - printMode=ChoicesSanitizer(['none', 'all', 'default'], required=True), + printMode=ChoicesSanitizer(['none', 'default'], required=True), internetRule=StringSanitizer(required=True), shareMode=ChoicesSanitizer(['home', 'all'], required=True), period=PeriodSanitizer(default='00:00', required=False), @@ -684,7 +684,7 @@ hosts = self._italc.ipAddresses(students_only=True) # print mode - if printMode in ('none', 'all'): + if printMode in ('none',): vextract.append('samba/printmode/hosts/%s' % printMode) vappend[vextract[-1]] = hosts vextract.append('cups/printmode/hosts/%s' % printMode) Index: umc/js/computerroom/SettingsDialog.js =================================================================== --- umc/js/computerroom/SettingsDialog.js (Revision 75565) +++ umc/js/computerroom/SettingsDialog.js (Arbeitskopie) @@ -104,8 +104,7 @@ label: _('Print mode'), staticValues: [ { id: 'default', label: _('Default (global settings)') }, - { id: 'none', label: _('Printing deactivated') }, - { id: 'all', label: _('Free printing') } + { id: 'none', label: _('Printing deactivated') } ] }, { type: TimeBox,