summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliot Smith <elliot.smith@intel.com>2016-01-21 17:11:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-10 13:29:20 +0000
commit481dc1154709d9d1061de259d7133335c7497051 (patch)
treef18ef043a70a0d31c5e1589b5b44a57a688a0683
parenta757d397dbc39ca479321263bafcc129451f21f1 (diff)
downloadpoky-contrib-481dc1154709d9d1061de259d7133335c7497051.tar.gz
poky-contrib-481dc1154709d9d1061de259d7133335c7497051.tar.bz2
poky-contrib-481dc1154709d9d1061de259d7133335c7497051.zip
bitbake: toaster: make locale packages uneditable in custom image page
When the packages associated with a custom image recipe are shown in the customrecipe editing page, locale packages are shown in the same way as all other packages. This gives the false impression that these packages can be removed, when in fact they are automatically added due to the IMAGE_LINGUAS build variable. Modify the customrecipe page so that locale packages cannot be removed, and provide some help text explaining why. [YOCTO #8927] (Bitbake rev: b2208e53c00a67a7d0345e7378e6806b8ae40fb4) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/orm/models.py14
-rw-r--r--bitbake/lib/toaster/toastergui/static/css/default.css3
-rw-r--r--bitbake/lib/toaster/toastergui/tables.py17
-rw-r--r--bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html2
4 files changed, 34 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 1cf997cfe5..b70fa18feb 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -749,6 +749,20 @@ class Package(models.Model):
section = models.CharField(max_length=80, blank=True)
license = models.CharField(max_length=80, blank=True)
+ @property
+ def is_locale_package(self):
+ """ Returns True if this package is identifiable as a locale package """
+ if self.name.find('locale') != -1:
+ return True
+ return False
+
+ @property
+ def is_packagegroup(self):
+ """ Returns True is this package is identifiable as a packagegroup """
+ if self.name.find('packagegroup') != -1:
+ return True
+ return False
+
class CustomImagePackage(Package):
# CustomImageRecipe fields to track pacakges appended,
# included and excluded from a CustomImageRecipe
diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css
index bc8a97bedc..b674a9de8e 100644
--- a/bitbake/lib/toaster/toastergui/static/css/default.css
+++ b/bitbake/lib/toaster/toastergui/static/css/default.css
@@ -153,6 +153,9 @@ select { width: auto; }
/* make tables Chrome-happy (me, not so much) */
table { table-layout: fixed; word-wrap: break-word; }
+table p { margin-bottom: 0 }
+.table td { vertical-align: middle; }
+
/* styles for the new build button */
.new-build .btn-primary { padding: 4px 30px; }
.new-build .alert { margin-top: 10px; }
diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py
index b73f459b2c..b906718b66 100644
--- a/bitbake/lib/toaster/toastergui/tables.py
+++ b/bitbake/lib/toaster/toastergui/tables.py
@@ -765,12 +765,27 @@ class SelectPackagesTable(PackagesTable):
def setup_columns(self, *args, **kwargs):
super(SelectPackagesTable, self).setup_columns(*args, **kwargs)
+ add_remove_template = '''
+ {% if data.is_locale_package %}
+ <p class="text-center">
+ <span class="muted">Locale package</span>
+ <i class="icon-question-sign get-help hover-help" title=""
+ data-original-title="This package is included in your image
+ because the locale is specified in the IMAGE_LINGUAS variable"
+ style="visibility: hidden;">
+ </i>
+ </p>
+ {% else %}
+ {% include "pkg_add_rm_btn.html" %}
+ {% endif %}
+ '''
+
self.add_column(title="Add | Remove",
hideable=False,
help_text="Use the add and remove buttons to modify "
"the package content of your custom image",
static_data_name="add_rm_pkg_btn",
- static_data_template='{% include "pkg_add_rm_btn.html" %}',
+ static_data_template=add_remove_template,
filter_name='in_current_image_filter')
def setup_filters(self, *args, **kwargs):
diff --git a/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html b/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html
index 493456f855..0d4429962e 100644
--- a/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html
+++ b/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html
@@ -7,7 +7,7 @@
">
<i class="icon-trash no-tooltip"></i>
Remove package
- </a>
+ </button>
<button class="btn btn-block add-rm-package-btn" data-directive="add" data-package="{{data.pk}}" data-package-url="{% url 'xhr_customrecipe_packages' extra.recipe_id data.pk %}" data-name="{{data.name}}" style="
{% if data.pk in extra.current_packages %}
display:none