-
+
-
+
diff --git a/app/shared/filters.js b/app/shared/filters.js
index 2b390d9c9..f0b7c6daa 100644
--- a/app/shared/filters.js
+++ b/app/shared/filters.js
@@ -99,4 +99,15 @@ angular.module('dockerui.filters', [])
var date = new Date(data * 1000);
return date.toDateString();
};
+ })
+ .filter('errorMsg', function() {
+ return function(object) {
+ var idx = 0;
+ var msg = '';
+ while (object[idx] && typeof(object[idx]) === 'string') {
+ msg += object[idx];
+ idx++;
+ }
+ return msg;
+ };
});
diff --git a/app/shared/services.js b/app/shared/services.js
index 5a06bc5db..6dbed1f94 100644
--- a/app/shared/services.js
+++ b/app/shared/services.js
@@ -119,7 +119,7 @@ angular.module('dockerui.services', ['ngResource'])
$.gritter.add({
title: title,
text: text,
- time: 6000,
+ time: 10000,
before_open: function() {
if($('.gritter-item-wrapper').length === 4) {
return false;
diff --git a/test/unit/shared/filters.spec.js b/test/unit/shared/filters.spec.js
index b6c753faf..f48640783 100644
--- a/test/unit/shared/filters.spec.js
+++ b/test/unit/shared/filters.spec.js
@@ -153,4 +153,13 @@ describe('filters', function () {
expect(getdateFilter(1420424998)).toBe('Sun Jan 04 2015');
}));
});
+
+ describe('errorMsgFilter', function() {
+ it('should convert the $resource object to a string message',
+ inject(function(errorMsgFilter) {
+ var response = {'0':'C','1':'o','2':'n','3':'f','4':'l','5':'i','6':'c','7':'t','8':',','9':' ','10':'T','11':'h','12':'e','13':' ','14':'n','15':'a','16':'m','17':'e','18':' ','19':'u','20':'b','21':'u','22':'n','23':'t','24':'u','25':'-','26':'s','27':'l','28':'e','29':'e','30':'p','31':'-','32':'r','33':'u','34':'n','35':'t','36':'i','37':'m','38':'e','39':' ','40':'i','41':'s','42':' ','43':'a','44':'l','45':'r','46':'e','47':'a','48':'d','49':'y','50':' ','51':'a','52':'s','53':'s','54':'i','55':'g','56':'n','57':'e','58':'d','59':' ','60':'t','61':'o','62':' ','63':'b','64':'6','65':'9','66':'e','67':'5','68':'3','69':'a','70':'6','71':'2','72':'2','73':'c','74':'8','75':'.','76':' ','77':'Y','78':'o','79':'u','80':' ','81':'h','82':'a','83':'v','84':'e','85':' ','86':'t','87':'o','88':' ','89':'d','90':'e','91':'l','92':'e','93':'t','94':'e','95':' ','96':'(','97':'o','98':'r','99':' ','100':'r','101':'e','102':'n','103':'a','104':'m','105':'e','106':')','107':' ','108':'t','109':'h','110':'a','111':'t','112':' ','113':'c','114':'o','115':'n','116':'t','117':'a','118':'i','119':'n','120':'e','121':'r','122':' ','123':'t','124':'o','125':' ','126':'b','127':'e','128':' ','129':'a','130':'b','131':'l','132':'e','133':' ','134':'t','135':'o','136':' ','137':'a','138':'s','139':'s','140':'i','141':'g','142':'n','143':' ','144':'u','145':'b','146':'u','147':'n','148':'t','149':'u','150':'-','151':'s','152':'l','153':'e','154':'e','155':'p','156':'-','157':'r','158':'u','159':'n','160':'t','161':'i','162':'m','163':'e','164':' ','165':'t','166':'o','167':' ','168':'a','169':' ','170':'c','171':'o','172':'n','173':'t','174':'a','175':'i','176':'n','177':'e','178':'r','179':' ','180':'a','181':'g','182':'a','183':'i','184':'n','185':'.','186':'\n','$promise':{},'$resolved':true};
+ var message = 'Conflict, The name ubuntu-sleep-runtime is already assigned to b69e53a622c8. You have to delete (or rename) that container to be able to assign ubuntu-sleep-runtime to a container again.\n';
+ expect(errorMsgFilter(response)).toBe(message);
+ }));
+ });
});
\ No newline at end of file