[review-request][PATCH] bitbake: toaster: layerdetails Don't show None type in description/summary

[review-request][PATCH] bitbake: toaster: layerdetails Don't show None type in description/summary

[Michael Wood]

When the result for the summary or description is None don't output the
result as the string version of None, use an empty value so that the
"Not set" mechanism works.

[YOCTO #7244]

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
---
 bitbake/lib/toaster/toastergui/templates/layerdetails.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
index 465d633..c162c8b 100644
--- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html
+++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
@@ -453,7 +453,7 @@
                 </dt>
                 <dd>
                   <span class="muted" style="display:none">Not set</span>
-                  <span class="current-value">{{layerversion.layer.summary}}</span>
+                  <span class="current-value">{{layerversion.layer.summary|default_if_none:''}}</span>
                   <form style="display:none; margin-bottom:20px">
                     <textarea class="span12" rows="2">{% if layerversion.layer.summary %}{{layerversion.layer.summary}}{% endif %}</textarea>
                     <button class="btn change-btn" data-layer-prop="summary" type="button">Save</button>
@@ -467,7 +467,7 @@
                 </dt>
                 <dd>
                   <span class="muted" style="display:none">Not set</span>
-                  <span class="current-value">{{layerversion.layer.description}}</span>
+                  <span class="current-value">{{layerversion.layer.description|default_if_none:''}}</span>
                   <form style="display:none; margin-bottom:20px">
                     <textarea class="span12" rows="6">{% if layerversion.layer.description %}{{layerversion.layer.description}}{% endif %}</textarea>
                     <button class="btn change-btn" data-layer-prop="description" type="button" >Save</button>
-- 
2.1.0

Re: [review-request][PATCH] bitbake: toaster: layerdetails Don't show None type in description/summary

[Damian, Alexandru]

[-- Attachment #1: Type: text/plain, Size: 2452 bytes --]

Taken for submission.

Cheers,
Alex

On Wed, Feb 18, 2015 at 3:09 PM, Michael Wood <michael.g.wood@intel.com>
wrote:

> When the result for the summary or description is None don't output the
> result as the string version of None, use an empty value so that the
> "Not set" mechanism works.
>
> [YOCTO #7244]
>
> Signed-off-by: Michael Wood <michael.g.wood@intel.com>
> ---
>  bitbake/lib/toaster/toastergui/templates/layerdetails.html | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html
> b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
> index 465d633..c162c8b 100644
> --- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html
> +++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
> @@ -453,7 +453,7 @@
>                  </dt>
>                  <dd>
>                    <span class="muted" style="display:none">Not set</span>
> -                  <span
> class="current-value">{{layerversion.layer.summary}}</span>
> +                  <span
> class="current-value">{{layerversion.layer.summary|default_if_none:''}}</span>
>                    <form style="display:none; margin-bottom:20px">
>                      <textarea class="span12" rows="2">{% if
> layerversion.layer.summary %}{{layerversion.layer.summary}}{% endif
> %}</textarea>
>                      <button class="btn change-btn"
> data-layer-prop="summary" type="button">Save</button>
> @@ -467,7 +467,7 @@
>                  </dt>
>                  <dd>
>                    <span class="muted" style="display:none">Not set</span>
> -                  <span
> class="current-value">{{layerversion.layer.description}}</span>
> +                  <span
> class="current-value">{{layerversion.layer.description|default_if_none:''}}</span>
>                    <form style="display:none; margin-bottom:20px">
>                      <textarea class="span12" rows="6">{% if
> layerversion.layer.description %}{{layerversion.layer.description}}{% endif
> %}</textarea>
>                      <button class="btn change-btn"
> data-layer-prop="description" type="button" >Save</button>
> --
> 2.1.0
>
> --
> _______________________________________________
> toaster mailing list
> toaster@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/toaster
>



-- 
Alex Damian
Yocto Project
SSG / OTC

[-- Attachment #2: Type: text/html, Size: 3750 bytes --]