projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8cd5b9c
)
run exports in weight order, #14924
author
mark
<mark>
Fri, 28 Oct 2011 06:44:26 +0000
(06:44 +0000)
committer
mark
<mark>
Fri, 28 Oct 2011 06:44:26 +0000
(06:44 +0000)
FS/FS/part_export.pm
patch
|
blob
|
history
FS/FS/part_svc.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_export.pm
b/FS/FS/part_export.pm
index
890c522
..
9a479b7
100644
(file)
--- a/
FS/FS/part_export.pm
+++ b/
FS/FS/part_export.pm
@@
-401,6
+401,18
@@
or hidden by default).
=cut
+=item weight
+
+Returns the 'weight' element from the export's %info hash, or 0 if there is
+no weight defined.
+
+=cut
+
+sub weight {
+ my $self = shift;
+ export_info()->{$self->exporttype}->{'weight'} || 0;
+}
+
=back
=head1 SUBROUTINES
diff --git
a/FS/FS/part_svc.pm
b/FS/FS/part_svc.pm
index
4d56fee
..
249a2b4
100644
(file)
--- a/
FS/FS/part_svc.pm
+++ b/
FS/FS/part_svc.pm
@@
-434,6
+434,7
@@
sub part_export {
my $self = shift;
my %search;
$search{'exporttype'} = shift if @_;
+ sort { $a->weight <=> $b->weight }
map { qsearchs('part_export', { 'exportnum' => $_->exportnum, %search } ) }
qsearch('export_svc', { 'svcpart' => $self->svcpart } );
}