diff options
author | Michael Wood <michael.g.wood@intel.com> | 2015-02-18 15:18:51 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-20 12:58:20 +0000 |
commit | 5db6a27f4847e51c6434a968f81d3ceffcc54952 (patch) | |
tree | 09bc1ff30484cf7eca7c1f0a62cde0e26d1a7958 /bitbake | |
parent | d27893dc74456423f9ac33674c6ca61b17b701ed (diff) | |
download | poky-5db6a27f4847e51c6434a968f81d3ceffcc54952.tar.gz |
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>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/importlayer.js | 1 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/importlayer.html | 6 | ||||
-rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 3 |
3 files changed, 0 insertions, 10 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/importlayer.js b/bitbake/lib/toaster/toastergui/static/js/importlayer.js index e782bda120..9d54286f4a 100644 --- 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) { | |||
136 | name: layerNameInput.val(), | 136 | name: layerNameInput.val(), |
137 | vcs_url: vcsURLInput.val(), | 137 | vcs_url: vcsURLInput.val(), |
138 | git_ref: gitRefInput.val(), | 138 | git_ref: gitRefInput.val(), |
139 | summary: $("#layer-summary").val(), | ||
140 | dir_path: $("#layer-subdir").val(), | 139 | dir_path: $("#layer-subdir").val(), |
141 | project_id: ctx.projectId, | 140 | project_id: ctx.projectId, |
142 | layer_deps: layerDepsCsv, | 141 | layer_deps: layerDepsCsv, |
diff --git a/bitbake/lib/toaster/toastergui/templates/importlayer.html b/bitbake/lib/toaster/toastergui/templates/importlayer.html index a4d8ee1ebd..1196e0cf41 100644 --- a/bitbake/lib/toaster/toastergui/templates/importlayer.html +++ b/bitbake/lib/toaster/toastergui/templates/importlayer.html | |||
@@ -84,12 +84,6 @@ | |||
84 | </div> | 84 | </div> |
85 | </div> | 85 | </div> |
86 | 86 | ||
87 | <label class="project-form" for="layer-description">Layer description | ||
88 | <span class="muted">(optional)</span> | ||
89 | <span class="icon-question-sign get-help" title="A short layer explanation" /> | ||
90 | </label> | ||
91 | <textarea id="layer-description" class="input-xxlarge"></textarea> | ||
92 | |||
93 | </fieldset> | 87 | </fieldset> |
94 | <fieldset class="air"> | 88 | <fieldset class="air"> |
95 | <legend> | 89 | <legend> |
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index bf148e20fa..be74c10f6e 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -2422,9 +2422,6 @@ if toastermain.settings.MANAGED: | |||
2422 | if layer_created: | 2422 | if layer_created: |
2423 | layer.layer_source = layer_source | 2423 | layer.layer_source = layer_source |
2424 | layer.vcs_url = post_data['vcs_url'] | 2424 | layer.vcs_url = post_data['vcs_url'] |
2425 | if post_data.has_key('summary'): | ||
2426 | layer.summary = layer.description = post_data['summary'] | ||
2427 | |||
2428 | layer.up_date = timezone.now() | 2425 | layer.up_date = timezone.now() |
2429 | layer.save() | 2426 | layer.save() |
2430 | else: | 2427 | else: |