pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Also provide branch info to UI/on socket

Browse source
This commit is contained in:
Gina Häußge 2015-08-26 15:25:16 +02:00
parent c7fd4809fd
commit cc8dcef8a1
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/octoprint/server/util/sockjs.py
View file

@ -66,6 +66,7 @@ class PrinterStateConnection(sockjs.tornado.SockJSConnection, octoprint.printer.
apikey=octoprint.server.UI_API_KEY, apikey=octoprint.server.UI_API_KEY,
version=octoprint.server.VERSION, version=octoprint.server.VERSION,
display_version=octoprint.server.DISPLAY_VERSION, display_version=octoprint.server.DISPLAY_VERSION,
branch=octoprint.server.BRANCH,
plugin_hash=plugin_hash.hexdigest(), plugin_hash=plugin_hash.hexdigest(),
config_hash=config_hash config_hash=config_hash
)) ))

3
src/octoprint/server/views.py
View file

@ -13,7 +13,7 @@ from flask import request, g, url_for, make_response, render_template, send_from
import octoprint.plugin import octoprint.plugin
from octoprint.server import app, userManager, pluginManager, gettext, \ from octoprint.server import app, userManager, pluginManager, gettext, \
debug, LOCALES, VERSION, DISPLAY_VERSION, UI_API_KEY debug, LOCALES, VERSION, DISPLAY_VERSION, UI_API_KEY, BRANCH
from octoprint.settings import settings from octoprint.settings import settings
from . import util from . import util
@ -311,6 +311,7 @@ def index():
debug=debug, debug=debug,
version=VERSION, version=VERSION,
display_version=DISPLAY_VERSION, display_version=DISPLAY_VERSION,
branch=BRANCH,
gcodeMobileThreshold=settings().get(["gcodeViewer", "mobileSizeThreshold"]), gcodeMobileThreshold=settings().get(["gcodeViewer", "mobileSizeThreshold"]),
gcodeThreshold=settings().get(["gcodeViewer", "sizeThreshold"]), gcodeThreshold=settings().get(["gcodeViewer", "sizeThreshold"]),
uiApiKey=UI_API_KEY, uiApiKey=UI_API_KEY,

1
src/octoprint/static/js/app/dataupdater.js
View file

@ -113,6 +113,7 @@ function DataUpdater(allViewModels) {
var oldVersion = VERSION; var oldVersion = VERSION;
VERSION = data["version"]; VERSION = data["version"];
DISPLAY_VERSION = data["display_version"]; DISPLAY_VERSION = data["display_version"];
BRANCH = data["branch"];
$("span.version").text(DISPLAY_VERSION); $("span.version").text(DISPLAY_VERSION);
var oldPluginHash = self._pluginHash; var oldPluginHash = self._pluginHash;

3
src/octoprint/templates/initscript.jinja2
View file

@ -22,11 +22,12 @@
var SOCKJS_URI = "{{ url_for('index') }}" + "sockjs"; var SOCKJS_URI = "{{ url_for('index') }}" + "sockjs";
var SOCKJS_DEBUG = CONFIG_DEBUG; var SOCKJS_DEBUG = CONFIG_DEBUG;
// sockjs should define CLOSE_NORMAL for us, but they don't (from ws spec) // sockjs should define CLOSE_NORMAL for us, but they don't (from ws spec)
var SOCKJS_CLOSE_NORMAL = 1000 var SOCKJS_CLOSE_NORMAL = 1000;
var UI_API_KEY = "{{ uiApiKey }}"; var UI_API_KEY = "{{ uiApiKey }}";
var VERSION = "{{ version }}"; var VERSION = "{{ version }}";
var DISPLAY_VERSION = "{{ display_version }}"; var DISPLAY_VERSION = "{{ display_version }}";
var BRANCH = "{{ branch }}";
var LOCALE = "{{ g.locale }}"; var LOCALE = "{{ g.locale }}";
var AVAILABLE_LOCALES = {{ locales|tojson }}; var AVAILABLE_LOCALES = {{ locales|tojson }};