Merge "Clean up terminal output for stack details section"
This commit is contained in:
commit
34de24a7b6
|
@ -135,18 +135,15 @@ def resource_to_url(resource):
|
||||||
def stack_output(output):
|
def stack_output(output):
|
||||||
if not output:
|
if not output:
|
||||||
return u''
|
return u''
|
||||||
if isinstance(output, dict) or isinstance(output, list):
|
|
||||||
json_string = json.dumps(output, indent=2)
|
|
||||||
safe_output = u'<pre>%s</pre>' % html.escape(json_string)
|
|
||||||
return safestring.mark_safe(safe_output)
|
|
||||||
if isinstance(output, basestring):
|
if isinstance(output, basestring):
|
||||||
parts = urlparse.urlsplit(output)
|
parts = urlparse.urlsplit(output)
|
||||||
if parts.netloc and parts.scheme in ('http', 'https'):
|
if parts.netloc and parts.scheme in ('http', 'https'):
|
||||||
url = html.escape(output)
|
url = html.escape(output)
|
||||||
safe_link = u'<a href="%s" target="_blank">%s</a>' % (url, url)
|
safe_link = u'<a href="%s" target="_blank">%s</a>' % (url, url)
|
||||||
return safestring.mark_safe(safe_link)
|
return safestring.mark_safe(safe_link)
|
||||||
return unicode(output)
|
if isinstance(output, dict) or isinstance(output, list):
|
||||||
|
output = json.dumps(output, indent=2)
|
||||||
|
return safestring.mark_safe(u'<pre>%s</pre>' % html.escape(output))
|
||||||
|
|
||||||
resource_images = {
|
resource_images = {
|
||||||
'LB_FAILED': '/static/dashboard/img/lb-red.svg',
|
'LB_FAILED': '/static/dashboard/img/lb-red.svg',
|
||||||
|
|
|
@ -87,7 +87,7 @@ class MappingsTests(test.TestCase):
|
||||||
'aaa')
|
'aaa')
|
||||||
|
|
||||||
def test_stack_output(self):
|
def test_stack_output(self):
|
||||||
self.assertEqual(u'foo', mappings.stack_output('foo'))
|
self.assertEqual(u'<pre>foo</pre>', mappings.stack_output('foo'))
|
||||||
self.assertEqual(u'', mappings.stack_output(None))
|
self.assertEqual(u'', mappings.stack_output(None))
|
||||||
|
|
||||||
outputs = ['one', 'two', 'three']
|
outputs = ['one', 'two', 'three']
|
||||||
|
|
Loading…
Reference in New Issue