From f4b3206d49c35beb783fc547cbc80477246fadf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 19 Jan 2016 11:19:51 +0100 Subject: [PATCH 1/2] Disable the settings dialog's save button while sending or receiving --- src/octoprint/static/js/app/viewmodels/settings.js | 3 +++ src/octoprint/templates/dialogs/settings.jinja2 | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/octoprint/static/js/app/viewmodels/settings.js b/src/octoprint/static/js/app/viewmodels/settings.js index 79c6d526..2ff228c4 100644 --- a/src/octoprint/static/js/app/viewmodels/settings.js +++ b/src/octoprint/static/js/app/viewmodels/settings.js @@ -8,6 +8,9 @@ $(function() { self.receiving = ko.observable(false); self.sending = ko.observable(false); + self.exchanging = ko.computed(function() { + return self.receiving() || self.sending(); + }); self.callbacks = []; self.api_enabled = ko.observable(undefined); diff --git a/src/octoprint/templates/dialogs/settings.jinja2 b/src/octoprint/templates/dialogs/settings.jinja2 index a87fa6a6..9d55104e 100644 --- a/src/octoprint/templates/dialogs/settings.jinja2 +++ b/src/octoprint/templates/dialogs/settings.jinja2 @@ -49,6 +49,6 @@ From c720cc3a4ae43a8f951eec347fa8e640b62f4fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 21 Jan 2016 10:58:00 +0100 Subject: [PATCH 2/2] Added note to not misuse (feature) requests for support questions --- CONTRIBUTING.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 68c09bcb..924bfa25 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -30,8 +30,12 @@ nothing but ticket management. - If you want to report a **bug**, [read "How to file a bug report" below](#how-to-file-a-bug-report) and *[use the provided template](#what-should-i-include-in-a-ticket)*. You do not need to do anything else with your ticket. -- If you want to post a **request** of any kind (feature request, documentation - request, ...), add `[Request]` to your issue's title (e.g. `[Request] Awesome new feature`). +- If you want to post a **feature request** or a **documentation request**, add `[Request]` + to your issue's title (e.g. `[Request] Awesome new feature`). A question on how to run/change/setup + something is **not** what qualifies as a request here, use the + [Mailinglist](https://groups.google.com/group/octoprint) or the + [Google+ Community](https://plus.google.com/communities/102771308349328485741) for + such support issues. - If you are a **developer** that wants to brainstorm a pull request or possible changes to the plugin system, add [Brainstorming] to your issue's title (e.g. `[Brainstorming] New plugin hook for doing some cool stuff`).