flapjack 0.9.4 → 0.9.5

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Flapjack Changelog
 
+# 0.9.5 - 2014-10-08
+- Bug: fix api_url handling in the web ui (@jessereynolds)
+
 # 0.9.4 - 2014-09-21
 - Bug: crash in pagerduty gateway when failing entities have no id #593 (@jessereynolds)
 - Bug: bugfix for updating rule data without contact_ids (no-issue) (@ali-graham)

data/lib/flapjack/gateways/web/public/js/backbone.jsonapi.js

@@ -187,7 +187,7 @@ Backbone.JSONAPIModel = Backbone.Model.extend({
     this.linked[type].remove(obj);
   },
 
-  urlRoot: function() { return(flapjack.api_url + "/" + this.name); },
+  urlRoot: function() { return(flapjack.api_url + this.name); },
 
   // can only be called from inside a 'change' event
   setDirty: function() {

data/lib/flapjack/gateways/web/public/js/modules/contact.js

@@ -48,7 +48,7 @@
 
   Contact.List = Backbone.JSONAPICollection.extend({
     model: Contact.Model,
-    url: function() { return flapjack.api_url + "/contacts"; }
+    url: function() { return flapjack.api_url + "contacts"; }
   });
 
   Contact.Views.List = Backbone.View.extend({
@@ -518,4 +518,4 @@
     }
   });
 
-})(flapjack, flapjack.module("contact"));
+})(flapjack, flapjack.module("contact"));

data/lib/flapjack/gateways/web/public/js/modules/entity.js

@@ -22,7 +22,7 @@
   Entity.List = Backbone.JSONAPICollection.extend({
     model:      Entity.Model,
     comparator: 'name',
-    url: function() { return flapjack.api_url + "/entities"; }
+    url: function() { return flapjack.api_url + "entities"; }
   });
 
-})(flapjack, flapjack.module("entity"));
+})(flapjack, flapjack.module("entity"));

data/lib/flapjack/gateways/web/public/js/modules/medium.js

@@ -21,9 +21,9 @@
     },
     sync: function(method, model, options) {
       if ( method == 'create') {
-        options.url = flapjack.api_url + '/contacts/' + model.contact.get('id') + '/' + this.name;
+        options.url = flapjack.api_url + 'contacts/' + model.contact.get('id') + '/' + this.name;
       } else {
-        options.url = flapjack.api_url + '/' + this.name + '/' + model.contact.get('id') + '_' + model.get('type');
+        options.url = flapjack.api_url + this.name + '/' + model.contact.get('id') + '_' + model.get('type');
       }
       Backbone.JSONAPIModel.prototype.sync(method, model, options);
     }
@@ -33,7 +33,7 @@
   Medium.List = Backbone.JSONAPICollection.extend({
     model:      Medium.Model,
     comparator: 'type',
-    url: function() { return flapjack.api_url + "/media"; }
+    url: function() { return flapjack.api_url + "media"; }
   });
 
-})(flapjack, flapjack.module("medium"));
+})(flapjack, flapjack.module("medium"));

data/lib/flapjack/gateways/web/public/js/self_stats.js

@@ -62,7 +62,7 @@ $(document).ready(function() {
 
   function updateData() {
     var api_url = $('div#data-api-url').data('api-url');
-    $.get(api_url + '/metrics?filter=event_queue_length', function(json) {
+    $.get(api_url + 'metrics?filter=event_queue_length', function(json) {
       var d = new Date().getTime();
       var value = {x: d, y: json.event_queue_length}
       data[0].values.push(value);

data/lib/flapjack/version.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -633,7 +633,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1556922316348718500
+      hash: 3444506708991125351
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -642,7 +642,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1556922316348718500
+      hash: 3444506708991125351
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23