aboutsummaryrefslogtreecommitdiffstats
path: root/lib/AdminPanel/Shared
diff options
context:
space:
mode:
authorAngelo Naselli <anaselli@linux.it>2014-06-25 22:57:30 +0200
committerAngelo Naselli <anaselli@linux.it>2014-06-25 22:57:30 +0200
commit02631e35d61c543dcdfaa6c72f6572a18326ca9d (patch)
tree95d2aa3f5573470b7d1ff3c0545ae3991e4d0d04 /lib/AdminPanel/Shared
parente8dc873cd36545df3c308c8abf84cd9505b2aa3f (diff)
downloadcolin-keep-02631e35d61c543dcdfaa6c72f6572a18326ca9d.tar
colin-keep-02631e35d61c543dcdfaa6c72f6572a18326ca9d.tar.gz
colin-keep-02631e35d61c543dcdfaa6c72f6572a18326ca9d.tar.bz2
colin-keep-02631e35d61c543dcdfaa6c72f6572a18326ca9d.tar.xz
colin-keep-02631e35d61c543dcdfaa6c72f6572a18326ca9d.zip
fixed any_item_selection management, was missed if skip_path is enabled
Diffstat (limited to 'lib/AdminPanel/Shared')
-rw-r--r--lib/AdminPanel/Shared/GUI.pm14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/AdminPanel/Shared/GUI.pm b/lib/AdminPanel/Shared/GUI.pm
index 493c8a7..00d9415 100644
--- a/lib/AdminPanel/Shared/GUI.pm
+++ b/lib/AdminPanel/Shared/GUI.pm
@@ -736,16 +736,16 @@ sub ask_fromTreeList {
}
elsif ($widget == $selectButton) {
my $item = $treeWidget->selectedItem();
+ my $getChoice = 1;
+ if (!exists $info->{any_item_selection} || $info->{any_item_selection} != 0) {
+ if ($item) {
+ $getChoice = (!$item->hasChildren());
+ }
+ }
if ($info->{skip_path} && $info->{skip_path} != 0) {
- $choice = $item->label() if ($item);
+ $choice = $item->label() if ($item && $getChoice);
}
else {
- my $getChoice = 1;
- if (!exists $info->{any_item_selection} || $info->{any_item_selection} != 0) {
- if ($item) {
- $getChoice = (!$item->hasChildren());
- }
- }
if ($getChoice) {
my $separator = exists $info->{item_separator} ? $info->{item_separator} : '/';
if ($item) {