View | Details | Raw Unified | Return to bug 44109
Collapse All | Expand All

(-)a/ucs-school-umc-computerroom/umc/js/computerroom.js (-4 / +5 lines)
 Lines 929-935   define([ Link Here 
929
				}
929
				}
930
930
931
				// start finishing the exam
931
				// start finishing the exam
932
				var info = this.get('roomInfo') || {};
932
				var info = lang.clone(this.get('roomInfo') || {});
933
				this.umcpCommand('schoolexam/exam/finish', {
933
				this.umcpCommand('schoolexam/exam/finish', {
934
					exam: info.exam,
934
					exam: info.exam,
935
					room: info.room
935
					room: info.room
 Lines 944-949   define([ Link Here 
944
					deferred.resolve();
944
					deferred.resolve();
945
				});
945
				});
946
946
947
				// reset room settings (prior to finishing the exam!)
948
				this._settingsDialog.reset();
949
				this._settingsDialog.save();
950
947
				// things to do after finishing the exam
951
				// things to do after finishing the exam
948
				deferred.then(lang.hitch(this, function() {
952
				deferred.then(lang.hitch(this, function() {
949
					return this.umcpCommand('computerroom/exam/finish', {
953
					return this.umcpCommand('computerroom/exam/finish', {
 Lines 959-967   define([ Link Here 
959
						delete info.examEndTime;
963
						delete info.examEndTime;
960
						this.set('roomInfo', info);
964
						this.set('roomInfo', info);
961
965
962
						// reset room settings
963
						this._settingsDialog.reset();
964
						this._settingsDialog.save();
965
					}
966
					}
966
				}));
967
				}));
967
			}));
968
			}));
(-)a/ucs-school-umc-computerroom/umc/python/computerroom/__init__.py (-2 / +1 lines)
 Lines 774-784   def settings_set(self, printMode, internetRule, shareMode, period=None, customRu Link Here 
774
			ucr.load()
778
			ucr.load()
775
			if not ucr.get(varname):
779
			if not ucr.get(varname):
776
				vset[varname] = '""'
780
				vset[varname] = '""'
781
				vunset.append(varname)
777
		else:
782
		else:
778
			# remove empty items ('""') in list
783
			# remove empty items ('""') in list
779
			vset[varname] = ' '.join([x for x in vset[varname].split(' ') if x != '""'])
784
			vset[varname] = ' '.join([x for x in vset[varname].split(' ') if x != '""'])
780
		if varname in vunset:
781
			del vunset[varname]
782
785
783
		# set values
786
		# set values
784
		ucr_vars = sorted('%s=%s' % x for x in vset.items())
787
		ucr_vars = sorted('%s=%s' % x for x in vset.items())

Return to bug 44109