Skip to content

Commit dbe21ee

Browse files
committed
works now!
1 parent f9c94b7 commit dbe21ee

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

bin/sparky-web.raku

+20-6
Original file line numberDiff line numberDiff line change
@@ -826,14 +826,27 @@ sub create-cro-app ($pool) {
826826
my @vars;
827827

828828
for (%project-conf<vars><> || []) -> $v {
829-
830-
if ($v<group> && %project-conf<group_vars><>.Bag $v<group><>.Bag) {
831-
say "{$v<name>} group:{$v<group>} is added by group condition ...";
829+
830+
my $pass = False;
831+
832+
if ($group) {
833+
for ($v<group>||[])<> -> $i {
834+
if $i eq $group {
835+
$pass = True;
836+
last;
837+
}
838+
}
832839
} else {
833-
say "{$v<name>} group:{($v<group>||[]).perl} is filtered out by group condition ...";
834-
next;
840+
$pass = True
835841
}
836842

843+
if $pass {
844+
say "{$v<name>} is added to final vars";
845+
} else {
846+
next;
847+
say "{$v<name>} is filtered out from final vars";
848+
}
849+
837850
@vars.push($v);
838851

839852
if $v<default> {
@@ -861,6 +874,7 @@ sub create-cro-app ($pool) {
861874
}
862875
}
863876
}
877+
864878
if $v<value> && $v<value>.isa(Str) {
865879
for $v<value> ~~ m:global/"%" (\S+?) "%"/ -> $c {
866880
my $var_id = $c[0].Str;
@@ -917,7 +931,7 @@ sub create-cro-app ($pool) {
917931
http-root => sparky-http-root(),
918932
sparky-tcp-port => sparky-tcp-port(),
919933
group_vars => $group ?? [] !! %project-conf<group_vars> || [],
920-
render-vars => $group ?? True !! ( @vars.elems > 0 ?? True !! False ),
934+
render-vars => $group ?? True !! (%project-conf<group_vars> ?? False !! True),
921935
css =>css(),
922936
navbar => navbar($user, $token),
923937
project => $project,

0 commit comments

Comments
 (0)