Infra/lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into ci

Browse Source 
* master:
  Fixed issue where hardcoded localhost:port combination existed in Javascript, added another step to setup.py 'package' that removes such instances and creates a more agnostic javascript blob.
  Fixing issue where nginx was not sending the right mimetype for CSS files.

Conflicts:
	gulp/build.js
This commit is contained in:
kevgliss
2015-07-20 16:53:58 -07:00
parent c89dff7994 b978435975
commit 9c0f2917ad
9 changed files with 90 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lemur/static/app/angular/app.js vendored
View File

@ -62,7 +62,7 @@ lemur.controller('datePickerController', function ($scope, $timeout){
lemur.factory('LemurRestangular', function (Restangular, $location, $auth) {
return Restangular.withConfig(function (RestangularConfigurer) {
RestangularConfigurer.setBaseUrl('http://127.0.0.1:5000/api/1');
RestangularConfigurer.setBaseUrl('http://localhost:5000/api/1');
RestangularConfigurer.setDefaultHttpFields({withCredentials: true});
RestangularConfigurer.addResponseInterceptor(function (data, operation, what, url, response, deferred) {

12
lemur/static/app/angular/plugins/services.js vendored Normal file
View File

@ -0,0 +1,12 @@
angular.module('lemur')
.service('PluginApi', function (LemurRestangular) {
return LemurRestangular.all('plugins');
})
.service('PluginService', function (PluginApi) {
var PluginService = this;
PluginService.get = function (type) {
return PluginApi.customGETLIST(type).then(function (plugins) {
return plugins;
});
};
});