diff options
| author | David Reyna <David.Reyna@windriver.com> | 2014-03-14 00:26:32 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-25 11:17:32 +0000 |
| commit | 4f02193f050666ff70821a6d8ef2ac2a744ef3fd (patch) | |
| tree | 5c21c7fb000e0a48922ceccce31328b9c8bcf596 | |
| parent | 604d2c8df30b0139704991703b99ae9039c0f342 (diff) | |
| download | ast2050-yocto-poky-4f02193f050666ff70821a6d8ef2ac2a744ef3fd.zip ast2050-yocto-poky-4f02193f050666ff70821a6d8ef2ac2a744ef3fd.tar.gz | |
bitbake: toaster: warn new filter replaces existing filter
If the user pop-ups a filter dialog when another filter is already
active, warn the user that the new filter would replace the
previous filter.
[YOCTO #5960]
(Bitbake rev: 6be58123fcdb0ff20de2a88315e1e3012effd1d3)
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 12 insertions, 0 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css index 53a3fee..d960f4b 100644 --- a/bitbake/lib/toaster/toastergui/static/css/default.css +++ b/bitbake/lib/toaster/toastergui/static/css/default.css @@ -105,6 +105,7 @@ select { width: auto; } .no-results { margin: 10px 0; } .task-name { margin-left: 7px; } .icon-hand-right {color: #ccccc; } +.help-inline { margin: 5px; } diff --git a/bitbake/lib/toaster/toastergui/templates/filtersnippet.html b/bitbake/lib/toaster/toastergui/templates/filtersnippet.html index e0e1181..a72eeaa 100644 --- a/bitbake/lib/toaster/toastergui/templates/filtersnippet.html +++ b/bitbake/lib/toaster/toastergui/templates/filtersnippet.html @@ -28,6 +28,11 @@ </div> <div class="modal-footer"> <button type="submit" class="btn btn-primary">Apply</button> + {% if request.GET.filter %} + {% if request.GET.filter|string_remove_regex:':.*' != f.options.0.1|string_remove_regex:':.*' %} + <span class="help-inline pull-left">You can only apply one filter to the table. This filter will override the current filter.</span> + {% endif %} + {% endif %} </div> </form> diff --git a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py index e7b23cb..39e92ce 100644 --- a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py +++ b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py @@ -189,6 +189,12 @@ def string_slice(strvar,slicevar): return strvar[int(first):int(last)] @register.filter +def string_remove_regex(value,ex): + """ remove sub-string of string that matches regex + """ + return re.sub(ex, '', value) + +@register.filter def filtered_installedsize(size, installed_size): """If package.installed_size not null and not empty return it, else return package.size |
