baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge tag 'v1.3.1'

Browse source
This commit is contained in:
Fernandez Ludovic 2017-06-16 16:52:53 +02:00
parent b452695c20 fe4d0e95b3
commit 131d8dd765
2 changed files with 41 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
CHANGELOG.md
View file

@ -1,5 +1,19 @@
# Change Log # Change Log
## [v1.3.1](https://github.com/containous/traefik/tree/v1.3.1) (2017-06-16)
[All Commits](https://github.com/containous/traefik/compare/v1.3.0...v1.3.1)
**Enhancements:**
- **[logs,eureka,marathon]** Minor logs changes ([#1749](https://github.com/containous/traefik/pull/1749) by [ldez](https://github.com/ldez))
**Bug fixes:**
- **[k8s]** Use correct type when watching for k8s secrets ([#1700](https://github.com/containous/traefik/pull/1700) by [kekoav](https://github.com/kekoav))
- **[middleware]** fix: Double compression. ([#1714](https://github.com/containous/traefik/pull/1714) by [ldez](https://github.com/ldez))
- **[webui]** Don't fail when backend or frontend are empty. ([#1757](https://github.com/containous/traefik/pull/1757) by [ldez](https://github.com/ldez))
**Documentation:**
- **[k8s]** Fix capitalization of PathPrefixStrip in kubernetes doc ([#1695](https://github.com/containous/traefik/pull/1695) by [Miouge1](https://github.com/Miouge1))
## [v1.3.0](https://github.com/containous/traefik/tree/v1.3.0) (2017-05-31) ## [v1.3.0](https://github.com/containous/traefik/tree/v1.3.0) (2017-05-31)
[All Commits](https://github.com/containous/traefik/compare/v1.2.0-rc1...v1.3.0) [All Commits](https://github.com/containous/traefik/compare/v1.2.0-rc1...v1.3.0)

51
webui/src/app/core/providers.resource.js
View file

@ -12,34 +12,37 @@ angular
function Providers($resource, $q) { function Providers($resource, $q) {
const resourceProvider = $resource('../api/providers'); const resourceProvider = $resource('../api/providers');
return { return {
get: function() { get: function () {
return $q((resolve, reject) => { return $q((resolve, reject) => {
resourceProvider.get().$promise.then((rawProviders) => { resourceProvider.get()
for (let providerName in rawProviders) { .$promise
if (rawProviders.hasOwnProperty(providerName)) { .then((rawProviders) => {
if (!providerName.startsWith('$')) { for (let providerName in rawProviders) {
// BackEnds mapping if (rawProviders.hasOwnProperty(providerName)) {
let bckends = rawProviders[providerName].backends; if (!providerName.startsWith('$')) {
// BackEnds mapping
let bckends = rawProviders[providerName].backends || {};
rawProviders[providerName].backends = Object.keys(bckends)
.map(key => {
const goodBackend = bckends[key];
goodBackend.backendId = key;
return goodBackend;
});
rawProviders[providerName].backends = Object.keys(bckends).map(key => { // FrontEnds mapping
const goodBackend = bckends[key]; let frtends = rawProviders[providerName].frontends || {};
goodBackend.backendId = key; rawProviders[providerName].frontends = Object.keys(frtends)
return goodBackend; .map(key => {
}); const goodFrontend = frtends[key];
goodFrontend.frontendId = key;
// FrontEnds mapping return goodFrontend;
let frtends = rawProviders[providerName].frontends; });
}
rawProviders[providerName].frontends = Object.keys(frtends).map(key => {
const goodFrontend = frtends[key];
goodFrontend.frontendId = key;
return goodFrontend;
});
} }
} }
} resolve(rawProviders);
resolve(rawProviders); })
}).catch(reject); .catch(reject);
}); });
} }
}; };