bitbake: toaster: importlayer Remove description input field

This wasn't required or working due to a typo and adds ambiguity between
the summary and description. The correct method for changing the description
or summary is via the layerdetails page.

[YOCTO #7190]

(Bitbake rev: 605298ff3ce919127003dadef95798472327f943)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bitbake/lib/toaster/toastergui/static/js/importlayer.js b/bitbake/lib/toaster/toastergui/static/js/importlayer.js
index e782bda120be9c449717a55f42192eed53502305..9d54286f4a3dcfcbb50c74af16610ec1936f86a0 100644 (file)
--- a/bitbake/lib/toaster/toastergui/static/js/importlayer.js
+++ b/bitbake/lib/toaster/toastergui/static/js/importlayer.js
@@ -136,7 +136,6 @@ function importLayerPageInit (ctx) {
         name: layerNameInput.val(),
         vcs_url: vcsURLInput.val(),
         git_ref: gitRefInput.val(),
-        summary:  $("#layer-summary").val(),
         dir_path: $("#layer-subdir").val(),
         project_id: ctx.projectId,
         layer_deps: layerDepsCsv,

diff --git a/bitbake/lib/toaster/toastergui/templates/importlayer.html b/bitbake/lib/toaster/toastergui/templates/importlayer.html
index a4d8ee1ebd2e06224df159bed085f61f8ce2671f..1196e0cf41657988ad8849ddf6029b443541bf6a 100644 (file)
--- a/bitbake/lib/toaster/toastergui/templates/importlayer.html
+++ b/bitbake/lib/toaster/toastergui/templates/importlayer.html
@@ -84,12 +84,6 @@
                             </div>
                           </div>
 
-                          <label class="project-form" for="layer-description">Layer description
-                            <span class="muted">(optional)</span>
-                            <span class="icon-question-sign get-help" title="A short layer explanation" />
-                          </label>
-                          <textarea id="layer-description" class="input-xxlarge"></textarea>
-
                     </fieldset>
                     <fieldset class="air">
                         <legend>

diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index bf148e20faeea4e42461352a2d498d72a6b709b9..be74c10f6ea72bdcaee640ac8c891d7213df0339 100755 (executable)
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -2422,9 +2422,6 @@ if toastermain.settings.MANAGED:
             if layer_created:
                 layer.layer_source = layer_source
                 layer.vcs_url = post_data['vcs_url']
-                if post_data.has_key('summary'):
-                    layer.summary = layer.description = post_data['summary']
-
                 layer.up_date = timezone.now()
                 layer.save()
             else: