Pflichtenhefte: Abschnitte in richtiger Reihenfolge ausgeben

diff --git a/SL/Controller/RequirementSpec.pm b/SL/Controller/RequirementSpec.pm
index 2f31f97a83085e14490fb0e5457d863a53a37d3c..b389ba37319e29e44f3feda89b933c93e8ee1b47 100644 (file)
--- a/SL/Controller/RequirementSpec.pm
+++ b/SL/Controller/RequirementSpec.pm
@@ -181,7 +181,7 @@ sub action_show {
   my ($self) = @_;
 
   my $title  = $self->requirement_spec->is_template ? t8('Show requirement spec template') : t8('Show requirement spec');
   my ($self) = @_;
 
   my $title  = $self->requirement_spec->is_template ? t8('Show requirement spec template') : t8('Show requirement spec');

-  my $item   = $::form->{requirement_spec_item_id} ? SL::DB::RequirementSpecItem->new(id => $::form->{requirement_spec_item_id})->load : @{ $self->requirement_spec->sections }[0];
+  my $item   = $::form->{requirement_spec_item_id} ? SL::DB::RequirementSpecItem->new(id => $::form->{requirement_spec_item_id})->load : @{ $self->requirement_spec->sections_sorted }[0];

   $self->requirement_spec_item($item);
 
   $self->render('requirement_spec/show', title => $title);
   $self->requirement_spec_item($item);
 
   $self->render('requirement_spec/show', title => $title);

diff --git a/templates/webpages/requirement_spec/show.html b/templates/webpages/requirement_spec/show.html
index 93aad7d794e57b915a0acc369ebcbd6b68ca0bb8..c41e87d84ca9895f5852cea38afb9ad5a78b1878 100644 (file)
--- a/templates/webpages/requirement_spec/show.html
+++ b/templates/webpages/requirement_spec/show.html
@@ -1,4 +1,5 @@
 [%- USE JSON -%][%- USE HTML %][%- USE L %][%- USE LxERP %][%- USE P -%]
 [%- USE JSON -%][%- USE HTML %][%- USE L %][%- USE LxERP %][%- USE P -%]

+[% SET sections = SELF.requirement_spec.sections_sorted || [] %]

 
 [%- INCLUDE 'common/flash.html' %]
 
 
 [%- INCLUDE 'common/flash.html' %]
 


@@ -62,7 +63,7 @@ $(function() {
       metadata: { type: "sections" },
       attr:     { id: "sections", class: "section-context-menu" },
       children: [
       metadata: { type: "sections" },
       attr:     { id: "sections", class: "section-context-menu" },
       children: [

-[% FOREACH section = SELF.requirement_spec.sections %]
+[% FOREACH section = sections %]

  [% P.requirement_spec_item_jstree_data(section).json %][% IF !loop.last %],[% END %]
 [% END %]
       ]},
  [% P.requirement_spec_item_jstree_data(section).json %][% IF !loop.last %],[% END %]
 [% END %]
       ]},


@@ -78,7 +79,7 @@ $(function() {
   ];
 
   var initially_open = ['tb-front', 'tb-back', 'sections'
   ];
 
   var initially_open = ['tb-front', 'tb-back', 'sections'

-[%- FOREACH section = SELF.requirement_spec.sections -%]
+[%- FOREACH section = sections -%]

         , "fb-[% section.id %]"
  [%- FOREACH function_block = section.children -%]
         , "fb-[% function_block.id -%]"
         , "fb-[% section.id %]"
  [%- FOREACH function_block = section.children -%]
         , "fb-[% function_block.id -%]"