diff options
| author | Michael Wood <michael.g.wood@intel.com> | 2015-02-18 15:09:44 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-20 12:58:19 +0000 |
| commit | 91e900f636771224623eb49fe66da071e69a639a (patch) | |
| tree | 83cea8396b0e24dd077aeb01f0a8c194a8571e52 | |
| parent | 64fc177299149376978a9e89eddcf0a9dc846a7e (diff) | |
| download | poky-91e900f636771224623eb49fe66da071e69a639a.tar.gz | |
bitbake: toaster: layerdetails Don't show None type in description/summary
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]
(Bitbake rev: 34397e585df0fc04ea53046347856e8cddb8f8e1)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/layerdetails.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html index 465d633062..c162c8b95c 100644 --- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html +++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html | |||
| @@ -453,7 +453,7 @@ | |||
| 453 | </dt> | 453 | </dt> |
| 454 | <dd> | 454 | <dd> |
| 455 | <span class="muted" style="display:none">Not set</span> | 455 | <span class="muted" style="display:none">Not set</span> |
| 456 | <span class="current-value">{{layerversion.layer.summary}}</span> | 456 | <span class="current-value">{{layerversion.layer.summary|default_if_none:''}}</span> |
| 457 | <form style="display:none; margin-bottom:20px"> | 457 | <form style="display:none; margin-bottom:20px"> |
| 458 | <textarea class="span12" rows="2">{% if layerversion.layer.summary %}{{layerversion.layer.summary}}{% endif %}</textarea> | 458 | <textarea class="span12" rows="2">{% if layerversion.layer.summary %}{{layerversion.layer.summary}}{% endif %}</textarea> |
| 459 | <button class="btn change-btn" data-layer-prop="summary" type="button">Save</button> | 459 | <button class="btn change-btn" data-layer-prop="summary" type="button">Save</button> |
| @@ -467,7 +467,7 @@ | |||
| 467 | </dt> | 467 | </dt> |
| 468 | <dd> | 468 | <dd> |
| 469 | <span class="muted" style="display:none">Not set</span> | 469 | <span class="muted" style="display:none">Not set</span> |
| 470 | <span class="current-value">{{layerversion.layer.description}}</span> | 470 | <span class="current-value">{{layerversion.layer.description|default_if_none:''}}</span> |
| 471 | <form style="display:none; margin-bottom:20px"> | 471 | <form style="display:none; margin-bottom:20px"> |
| 472 | <textarea class="span12" rows="6">{% if layerversion.layer.description %}{{layerversion.layer.description}}{% endif %}</textarea> | 472 | <textarea class="span12" rows="6">{% if layerversion.layer.description %}{{layerversion.layer.description}}{% endif %}</textarea> |
| 473 | <button class="btn change-btn" data-layer-prop="description" type="button" >Save</button> | 473 | <button class="btn change-btn" data-layer-prop="description" type="button" >Save</button> |