Attachment 7998 Details for Bug 42356

[patch] show_screen_view_by_direct_link_in_computerroom.patch

show_screen_view_by_direct_link_in_computerroom.patch (text/plain), 2.55 KB, created by Andreas Peichert on 2016-09-12 14:32 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Peichert

Created: 2016-09-12 14:32 CEST

Size: 2.55 KB

patch

obsolete

>diff --git a/ucs-school-umc-computerroom/debian/changelog b/ucs-school-umc-computerroom/debian/changelog
>index c949adf..86097bb 100644
>--- a/ucs-school-umc-computerroom/debian/changelog
>+++ b/ucs-school-umc-computerroom/debian/changelog
>@@ -1,3 +1,9 @@
>+ucs-school-umc-computerroom (5.1.0-11) unstable; urgency=low
>+
>+  * Added url flavour=screenshot to show screen view automatically. #5078
>+
>+ -- Andreas Peichert <peichert@univention.de>  Fri, 20 May 2016 13:44:31 +0200
>+
> ucs-school-umc-computerroom (5.1.0-10) unstable; urgency=low
> 
>   * Added close functionality to computerroom module. #4248
>diff --git a/ucs-school-umc-computerroom/umc/js/computerroom.js b/ucs-school-umc-computerroom/umc/js/computerroom.js
>index d2b244c..ac05aae 100644
>--- a/ucs-school-umc-computerroom/umc/js/computerroom.js
>+++ b/ucs-school-umc-computerroom/umc/js/computerroom.js
>@@ -32,6 +32,7 @@ define([
> 	"dojo/_base/declare",
> 	"dojo/_base/lang",
> 	"dojo/_base/array",
>+	"dojo/io-query",
> 	"dojo/aspect",
> 	"dojo/dom",
> 	"dojo/Deferred",
>@@ -59,7 +60,7 @@ define([
> 	"umc/modules/computerroom/ScreenshotView",
> 	"umc/modules/computerroom/SettingsDialog",
> 	"umc/i18n!umc/modules/computerroom"
>-], function(declare, lang, array, aspect, dom, Deferred, ItemFileWriteStore, DataStore, Memory, all, DijitProgressBar,
>+], function(declare, lang, array, ioQuery, aspect, dom, Deferred, ItemFileWriteStore, DataStore, Memory, all, DijitProgressBar,
>             Dialog, Tooltip, styles, dialog, tools, app, ExpandingTitlePane, Grid, Button, Module, Page, Form,
>             ContainerWidget, Text, ComboBox, ProgressBar, ScreenshotView, SettingsDialog, _) {
> 
>@@ -141,6 +142,9 @@ define([
> 		// holds information about the active room
> 		roomInfo: null,
> 
>+		// holds the flavour which should be loaded after acquiring a computerroom
>+		flavour: null,
>+
> 		// internal reference to the grid
> 		_grid: null,
> 
>@@ -933,6 +937,10 @@ define([
> 						this._showExamFinishedDialog();
> 					}
> 				}
>+
>+				// read flavour from url
>+				var flavour = ioQuery.queryToObject(window.location.search.substring(1))['flavour'] || '';
>+				this.set('flavour', flavour);
> 			}));
> 		},
> 
>@@ -1334,6 +1342,13 @@ define([
> 
> 				}
> 
>+				// change to flavour only once
>+				var flavour = this.get('flavour')
>+				if (flavour === 'screenshot') {
>+					 this._screenshot(null, this._grid.getAllItems())
>+				}
>+				this.set('flavour', null);
>+
> 			}), lang.hitch(this, function(err) {
> 				// error case, update went wrong, try to reinitiate the computer room (see Bug #27202)
> 				console.warn('WARN: the command "computerroom/update" failed:', err);

Actions: View | Diff

Attachments on bug 42356: 7998