Fixed a compatibility problem between WRE and new Spectre code.
This commit is contained in:
parent
5ef8252ca9
commit
33f038359e
2 changed files with 14 additions and 10 deletions
|
|
@ -1,4 +1,5 @@
|
||||||
7.8.4
|
7.8.4
|
||||||
|
- Fixed a compatibility problem between WRE and new Spectre code.
|
||||||
|
|
||||||
7.8.3
|
7.8.3
|
||||||
- Rewrote Spectre's workflow queues to prevent it from "forgetting" about some workflows.
|
- Rewrote Spectre's workflow queues to prevent it from "forgetting" about some workflows.
|
||||||
|
|
|
||||||
|
|
@ -294,18 +294,21 @@ sub getJsonStatus {
|
||||||
);
|
);
|
||||||
my %output;
|
my %output;
|
||||||
if ($sitename) { #must have entry for each queue
|
if ($sitename) { #must have entry for each queue
|
||||||
$output{$sitename} = \%queues;
|
%output = %queues;
|
||||||
}
|
foreach my $instance ($self->getInstances) {
|
||||||
foreach my $instance ($self->getInstances) {
|
my $queue = ucfirst($instance->{status});
|
||||||
my $site = $instance->{sitename};
|
push @{$output{$queue}}, [$instance->{workingPriority}, $instance->{instanceId}, $instance];
|
||||||
unless (exists $output{$site}) { # must have an entry for each queue in each site
|
|
||||||
$output{$site} = \%queues;
|
|
||||||
}
|
}
|
||||||
my $queue = ucfirst($instance->{status});
|
|
||||||
push @{$output{$site}{$queue}}, [$instance->{workingPriority}, $instance->{instanceId}, $instance];
|
|
||||||
}
|
}
|
||||||
if ($sitename) { # single sitename option
|
else {
|
||||||
%output = %{$output{$sitename}};
|
foreach my $instance ($self->getInstances) {
|
||||||
|
my $site = $instance->{sitename};
|
||||||
|
unless (exists $output{$site}) { # must have an entry for each queue in each site
|
||||||
|
$output{$site} = \%queues;
|
||||||
|
}
|
||||||
|
my $queue = ucfirst($instance->{status});
|
||||||
|
push @{$output{$site}{$queue}}, $instance;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$kernel->call(IKC=>post=>$rsvp, encode_json(\%output));
|
$kernel->call(IKC=>post=>$rsvp, encode_json(\%output));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue