github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'chiu0602-master' into develop

pull/11/head
Anthony Lapenna 2016-06-08 18:34:33 +12:00
parent 791e069a4c 7f5be16db8
commit b1e4800605
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/app.js
View File

@ -31,7 +31,7 @@ angular.module('uifordocker', [
$urlRouterProvider.otherwise('/');
$stateProvider
$stateProvider
.state('index', {
url: '/',
templateUrl: 'app/components/dashboard/dashboard.html',
@ -92,7 +92,8 @@ angular.module('uifordocker', [
$httpProvider.interceptors.push(function() {
return {
'response': function(response) {
if (typeof(response.data) === 'string' && response.data.startsWith('Conflict.')) {
if (typeof(response.data) === 'string' &&
(response.data.startsWith('Conflict.') || response.data.startsWith('conflict:'))) {
$.gritter.add({
title: 'Error',
text: $('<div>').text(response.data).html(),