You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by ahgittin <gi...@git.apache.org> on 2014/10/17 15:44:49 UTC
[GitHub] incubator-brooklyn pull request: Misc fixes
GitHub user ahgittin opened a pull request:
https://github.com/apache/incubator-brooklyn/pull/253
Misc fixes
allowing JS override access to standby server
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ahgittin/incubator-brooklyn misc-fixes
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-brooklyn/pull/253.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #253
----
commit c3fa5800aa837040c713e68b2d092fca7901dfa2
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Date: 2014-10-17T13:36:26Z
allow override for webapp to access standby server (POSTs are still disallowed, unless you do force)
commit e3bde8a9dfd3f011e62ce2962fe9d795f79e14af
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Date: 2014-10-17T13:42:57Z
allow groovy requests to standby server
commit 88ce44a8fe311e99220b843c381a7f2caafec156
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Date: 2014-10-17T13:43:44Z
demote CatalogDto "warning" to debug; we sometimes validly pass empty DTO's from rebind
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Misc fixes
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-brooklyn/pull/253
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Misc fixes
Posted by sjcorbett <gi...@git.apache.org>.
Github user sjcorbett commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/253#discussion_r19018374
--- Diff: usage/jsgui/src/main/webapp/assets/js/router.js ---
@@ -159,21 +159,43 @@ define([
template: _.template(ServerNotMasterHtml),
scheduledRedirect: false,
initialize: function() {
+ this.carryOnRegardless = false;
this.listenTo(ha, "change", this.render);
},
render: function() {
- if (!ha.isMaster()) {
+ var that = this;
+
+ if (!ha.isMaster() && !this.carryOnRegardless) {
var masterUri = ha.getMasterUri();
this.$el.html(this.template({"masterUri": masterUri}));
- if (masterUri && !this.scheduledRedirect) {
+
+ log("render, redirect = "+this.redirectPending);
+
+ $("#dismiss-standby-warning", this.$el).click(function() {
--- End diff --
But really you should include this in the view's `events` hash, like standard Backbone views.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Misc fixes
Posted by sjcorbett <gi...@git.apache.org>.
Github user sjcorbett commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/253#discussion_r19018298
--- Diff: usage/jsgui/src/main/webapp/assets/js/router.js ---
@@ -159,21 +159,43 @@ define([
template: _.template(ServerNotMasterHtml),
scheduledRedirect: false,
initialize: function() {
+ this.carryOnRegardless = false;
this.listenTo(ha, "change", this.render);
},
render: function() {
- if (!ha.isMaster()) {
+ var that = this;
+
+ if (!ha.isMaster() && !this.carryOnRegardless) {
var masterUri = ha.getMasterUri();
this.$el.html(this.template({"masterUri": masterUri}));
- if (masterUri && !this.scheduledRedirect) {
+
+ log("render, redirect = "+this.redirectPending);
+
+ $("#dismiss-standby-warning", this.$el).click(function() {
--- End diff --
Minor: you should be able to just select with `this.$("#dismiss-standby-warning")`
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---