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

(-)a/ucs-school-umc-computerroom/debian/changelog (+6 lines)
 Lines 1-3    Link Here 
1
ucs-school-umc-computerroom (5.1.0-11) unstable; urgency=low
2
3
  * Added url flavour=screenshot to show screen view automatically. #5078
4
5
 -- Andreas Peichert <peichert@univention.de>  Fri, 20 May 2016 13:44:31 +0200
6
1
ucs-school-umc-computerroom (5.1.0-10) unstable; urgency=low
7
ucs-school-umc-computerroom (5.1.0-10) unstable; urgency=low
2
8
3
  * Added close functionality to computerroom module. #4248
9
  * Added close functionality to computerroom module. #4248
(-)a/ucs-school-umc-computerroom/umc/js/computerroom.js (-1 / +16 lines)
 Lines 32-37   define([ Link Here 
32
	"dojo/_base/declare",
32
	"dojo/_base/declare",
33
	"dojo/_base/lang",
33
	"dojo/_base/lang",
34
	"dojo/_base/array",
34
	"dojo/_base/array",
35
	"dojo/io-query",
35
	"dojo/aspect",
36
	"dojo/aspect",
36
	"dojo/dom",
37
	"dojo/dom",
37
	"dojo/Deferred",
38
	"dojo/Deferred",
 Lines 59-65   define([ Link Here 
59
	"umc/modules/computerroom/ScreenshotView",
60
	"umc/modules/computerroom/ScreenshotView",
60
	"umc/modules/computerroom/SettingsDialog",
61
	"umc/modules/computerroom/SettingsDialog",
61
	"umc/i18n!umc/modules/computerroom"
62
	"umc/i18n!umc/modules/computerroom"
62
], function(declare, lang, array, aspect, dom, Deferred, ItemFileWriteStore, DataStore, Memory, all, DijitProgressBar,
63
], function(declare, lang, array, ioQuery, aspect, dom, Deferred, ItemFileWriteStore, DataStore, Memory, all, DijitProgressBar,
63
            Dialog, Tooltip, styles, dialog, tools, app, ExpandingTitlePane, Grid, Button, Module, Page, Form,
64
            Dialog, Tooltip, styles, dialog, tools, app, ExpandingTitlePane, Grid, Button, Module, Page, Form,
64
            ContainerWidget, Text, ComboBox, ProgressBar, ScreenshotView, SettingsDialog, _) {
65
            ContainerWidget, Text, ComboBox, ProgressBar, ScreenshotView, SettingsDialog, _) {
65
66
 Lines 141-146   define([ Link Here 
141
		// holds information about the active room
142
		// holds information about the active room
142
		roomInfo: null,
143
		roomInfo: null,
143
144
145
		// holds the flavour which should be loaded after acquiring a computerroom
146
		flavour: null,
147
144
		// internal reference to the grid
148
		// internal reference to the grid
145
		_grid: null,
149
		_grid: null,
146
150
 Lines 933-938   define([ Link Here 
933
						this._showExamFinishedDialog();
937
						this._showExamFinishedDialog();
934
					}
938
					}
935
				}
939
				}
940
941
				// read flavour from url
942
				var flavour = ioQuery.queryToObject(window.location.search.substring(1))['flavour'] || '';
943
				this.set('flavour', flavour);
936
			}));
944
			}));
937
		},
945
		},
938
946
 Lines 1334-1339   define([ Link Here 
1334
1342
1335
				}
1343
				}
1336
1344
1345
				// change to flavour only once
1346
				var flavour = this.get('flavour')
1347
				if (flavour === 'screenshot') {
1348
					 this._screenshot(null, this._grid.getAllItems())
1349
				}
1350
				this.set('flavour', null);
1351
1337
			}), lang.hitch(this, function(err) {
1352
			}), lang.hitch(this, function(err) {
1338
				// error case, update went wrong, try to reinitiate the computer room (see Bug #27202)
1353
				// error case, update went wrong, try to reinitiate the computer room (see Bug #27202)
1339
				console.warn('WARN: the command "computerroom/update" failed:', err);
1354
				console.warn('WARN: the command "computerroom/update" failed:', err);

Return to bug 42356