From 6e687171b02c26c0413af9315c67900e0d03001e Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 21 Jun 2018 13:43:55 -0300 Subject: [PATCH] Bug 15836: UI changes The script admin/classsources.pl has been adjusted to follow usual patterns used in other Koha scripts. $op can be add_source, add_source_validate, etc. Deletion steps have been removed (there is a JS confirmation box) to simplify both script and template. --- admin/classsources.pl | 444 ++++++++++----------- installer/data/mysql/atomicupdate/bug_15836.perl | 2 +- .../prog/en/modules/admin/classsources.tt | 352 ++++++++++------ 3 files changed, 438 insertions(+), 360 deletions(-) diff --git a/admin/classsources.pl b/admin/classsources.pl index ff6d86e36e..24a257034a 100755 --- a/admin/classsources.pl +++ b/admin/classsources.pl @@ -1,6 +1,7 @@ #! /usr/bin/perl # # Copyright 2007 LibLime +# Copyright 2018 Koha Development Team # # This file is part of Koha. # @@ -26,274 +27,257 @@ use C4::Output; use C4::Koha; use C4::ClassSource; use C4::ClassSortRoutine; +use Koha::ClassSources; +use Koha::ClassSortRules; +use Koha::ClassSplitRules; my $script_name = "/cgi-bin/koha/admin/classsources.pl"; -my $input = new CGI; -my $op = $input->param('op') || ''; -my $source_code = $input->param('class_source'); -my $rule_code = $input->param('sort_rule'); -my $sort_routine = $input->param('sort_routine'); -my ($template, $loggedinuser, $cookie) - = get_template_and_user({template_name => "admin/classsources.tt", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => {parameters => 'parameters_remaining_permissions'}, - debug => 1, - }); - -$template->param(script_name => $script_name); -$template->param($op => 1) if $op; -my $description = $input->param('description'); -my $used = $input->param('used'); -my $display_lists = 0; -if ($op eq "add_source") { - add_class_source_form($template); -} elsif ($op eq "add_source_confirmed") { - add_class_source($template, - $source_code, - $description, - $used eq "used" ? 1 : 0, - $rule_code); - $display_lists = 1; -} elsif ($op eq "delete_source") { - delete_class_source_form($template, $source_code); -} elsif ($op eq "delete_source_confirmed") { - delete_class_source($template, $source_code); - $display_lists = 1; -} elsif ($op eq "edit_source") { - edit_class_source_form($template, $source_code); -} elsif ($op eq "edit_source_confirmed") { - edit_class_source($template, - $source_code, - $description, - $used eq "used" ? 1 : 0, - $rule_code); - $display_lists = 1; -} elsif ($op eq "add_sort_rule") { - add_class_sort_rule_form($template); -} elsif ($op eq "add_sort_rule_confirmed") { - add_class_sort_rule($template, - $rule_code, - $description, - $sort_routine); - $display_lists = 1; -} elsif ($op eq "delete_sort_rule") { - delete_sort_rule_form($template, $rule_code); -} elsif ($op eq "delete_sort_rule_confirmed") { - delete_sort_rule($template, $rule_code); - $display_lists = 1; -} elsif ($op eq "edit_sort_rule") { - edit_class_sort_rule_form($template, $rule_code); -} elsif ($op eq "edit_sort_rule_confirmed") { - edit_class_sort_rule($template, - $rule_code, - $description, - $sort_routine); - $display_lists = 1; -} else { - $display_lists = 1; -} - -if ($display_lists) { - $template->param(display_lists => 1); - class_source_list($template); - class_sort_rule_list($template); -} - -output_html_with_http_headers $input, $cookie, $template->output; +my $input = new CGI; +my $op = $input->param('op') || 'list'; +my $cn_source = $input->param('cn_source'); +my $class_sort_rule = $input->param('class_sort_rule'); +my $class_split_rule = $input->param('class_split_rule'); +my $sort_routine = $input->param('sort_routine'); +my $split_routine = $input->param('split_routine'); +my $split_regex = $input->param('split_regex'); +my $description = $input->param('description'); +my $used = $input->param('used'); + +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "admin/classsources.tt", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => { parameters => 'parameters_remaining_permissions' }, + debug => 1, + } +); -exit 0; +my @messages; +$template->param( script_name => $script_name ); -sub add_class_source_form { - my ($template) = @_; +if ( $op eq "add_source" ) { + my $class_source = + $cn_source ? Koha::ClassSources->find($cn_source) : undef; $template->param( - class_source_form => 1, - confirm_op => "add_source_confirmed", - used => 0 + class_source => $class_source, + sort_rules => scalar Koha::ClassSortRules->search, + split_rules => scalar Koha::ClassSplitRules->search, ); - get_sort_rule_codes($template, ''); } +elsif ( $op eq "add_source_validate" ) { + my $class_source = Koha::ClassSources->find($cn_source); + if ($class_source) { + $class_source->set( + { + description => $description, + used => ( $used eq 'used' ? 1 : 0 ), + class_sort_rule => $class_sort_rule, + class_split_rule => $class_split_rule, + } + ); + eval { $class_source->store; }; + if ($@) { + push @messages, + { type => 'error', code => 'error_on_update_source' }; + } + else { + push @messages, + { type => 'message', code => 'success_on_update_source' }; + } -sub add_class_source { - my ($template, $source_code, $description, $used, $sort_rule) = @_; - my $success = AddClassSource($source_code, $description, $used, $sort_rule); - if ($success > 0) { - $template->param(added_source => $source_code); - } else { - $template->param(failed_add_source => $source_code); } -} - -sub edit_class_source_form { - my ($template, $source_code) = @_; - - my $source = GetClassSource($source_code); - $template->param( - class_source_form => 1, - edit_class_source => 1, - class_source => $source_code, - confirm_op => "edit_source_confirmed", - description => $source->{'description'}, - used => $source->{'used'}, - ); + else { + $class_source = Koha::ClassSource->new( + { + cn_source => $cn_source, + description => $description, + used => ( $used eq 'used' ? 1 : 0 ), + class_sort_rule => $class_sort_rule, + class_split_rule => $class_split_rule, + } + ); + eval { $class_source->store; }; + if ($@) { + push @messages, + { type => 'error', code => 'error_on_insert_source' }; + } + else { + push @messages, + { type => 'message', code => 'success_on_insert_source' }; + } + } - get_sort_rule_codes($template, $source->{'class_sort_rule'}); + $op = 'list'; } +elsif ( $op eq "delete_source_confirmed" ) { + my $class_source = Koha::ClassSources->find($cn_source); + my $deleted = eval { $class_source->delete }; + if ( $@ or not $deleted ) { + push @messages, { type => 'error', code => 'error_on_delete_source' }; + } + else { + push @messages, + { type => 'message', code => 'success_on_delete_source' }; + } -sub edit_class_source { - my ($template, $source_code, $description, $used, $sort_rule) = @_; - ModClassSource($source_code, $description, $used, $sort_rule); - $template->param(edited_source => $source_code); + $op = 'list'; } - - -sub delete_class_source_form { - my ($template, $source_code) = @_; +elsif ( $op eq "add_sort_rule" ) { + my $sort_rule = + $class_sort_rule ? Koha::ClassSortRules->find($class_sort_rule) : undef; $template->param( - delete_class_source_form => 1, - confirm_op => "delete_source_confirmed", - class_source => $source_code, + sort_rule => $sort_rule, + sort_routines => get_class_sort_routines(), ); } +elsif ( $op eq "add_sort_rule_validate" ) { + my $sort_rule = Koha::ClassSortRules->find($class_sort_rule); + if ($sort_rule) { + $sort_rule->set( + { description => $description, sort_routine => $sort_routine } ); + eval { $sort_rule->store; }; + if ($@) { + push @messages, + { type => 'error', code => 'error_on_update_sort_rule' }; + } + else { + push @messages, + { type => 'message', code => 'success_on_update_sort_rule' }; + } -sub delete_class_source { - my ($template, $source_code) = @_; - DelClassSource($source_code); - $template->param(deleted_source => $source_code); + } + else { + $sort_rule = Koha::ClassSortRule->new( + { + class_sort_rule => $class_sort_rule, + description => $description, + sort_routine => $sort_routine, + } + ); + eval { $sort_rule->store; }; + if ($@) { + push @messages, + { type => 'error', code => 'error_on_insert_sort_rule' }; + } + else { + push @messages, + { type => 'message', code => 'success_on_insert_sort_rule' }; + } + } + $op = 'list'; } - -sub get_sort_rule_codes { - my ($template, $current_rule) = @_; - - my $sort_rules = GetClassSortRules(); - - my @sort_rules = (); - foreach my $sort_rule (sort keys %$sort_rules) { - my $sort_rule = $sort_rules->{$sort_rule}; - push @sort_rules, { - rule => $sort_rule->{'class_sort_rule'}, - description => $sort_rule->{'description'}, - selected => $sort_rule->{'class_sort_rule'} eq $current_rule ? 1 : 0 - }; +elsif ( $op eq "delete_sort_rule" ) { + my $sort_rule = Koha::ClassSortRules->find($class_sort_rule); + my $deleted = eval { $sort_rule->delete }; + if ( $@ or not $deleted ) { + push @messages, + { type => 'error', code => 'error_on_delete_sort_rule' }; + } + else { + push @messages, + { type => 'message', code => 'success_on_delete_sort_rule' }; } - $template->param(rules_dropdown => \@sort_rules); - + $op = 'list'; } - -sub add_class_sort_rule_form { - my ($template) = @_; +elsif ( $op eq "add_split_rule" ) { + my $split_rule = + $class_split_rule + ? Koha::ClassSplitRules->find($class_split_rule) + : undef; $template->param( - sort_rule_form => 1, - confirm_op => "add_sort_rule_confirmed" + split_rule => $split_rule, + split_routines => get_class_split_routines(), ); - get_class_sort_routines($template, ""); } +elsif ( $op eq "add_split_rule_validate" ) { + my $split_rule = Koha::ClassSplitRules->find($class_split_rule); + if ($split_rule) { + $split_rule->set( + { + description => $description, + split_routine => $split_routine, + split_regex => + ( $split_routine eq 'RegEx' ? $split_regex : '' ), + } + ); + eval { $split_rule->store; }; + if ($@) { + push @messages, + { type => 'error', code => 'error_on_update_split_rule' }; + } + else { + push @messages, + { type => 'message', code => 'success_on_update_split_rule' }; + } -sub add_class_sort_rule { - my ($template, $rule_code, $description, $sort_routine) = @_; - my $success = AddClassSortRule($rule_code, $description, $sort_routine); - if ($success > 0) { - $template->param(added_rule => $rule_code); - } else { - $template->param(failed_add_rule => $rule_code); } -} - -sub delete_sort_rule_form { - my ($template, $rule_code) = @_; - - my @sources = GetSourcesForSortRule($rule_code); - if ($#sources == -1) { - $template->param( - delete_sort_rule_form => 1, - confirm_op => "delete_sort_rule_confirmed", - sort_rule => $rule_code, - ); - } else { - $template->param( - delete_sort_rule_impossible => 1, - sort_rule => $rule_code + else { + $split_rule = Koha::ClassSplitRule->new( + { + class_split_rule => $class_split_rule, + description => $description, + split_routine => $split_routine, + split_regex => + ( $split_routine eq 'RegEx' ? $split_regex : '' ), + } ); + eval { $split_rule->store; }; + if ($@) { + warn $@; + push @messages, + { type => 'error', code => 'error_on_insert_split_rule' }; + } + else { + push @messages, + { type => 'message', code => 'success_on_insert_split_rule' }; + } } + $op = 'list'; } - -sub delete_sort_rule { - my ($template, $rule_code) = @_; - DelClassSortRule($rule_code); - $template->param(deleted_rule => $rule_code); +elsif ( $op eq "delete_split_rule" ) { + my $split_rule = Koha::ClassSplitRules->find($class_split_rule); + my $deleted = eval { $split_rule->delete }; + if ( $@ or not $deleted ) { + push @messages, + { type => 'error', code => 'error_on_delete_split_rule' }; + } + else { + push @messages, + { type => 'message', code => 'success_on_delete_split_rule' }; + } + $op = 'list'; } -sub edit_class_sort_rule_form { - my ($template, $rule_code) = @_; - - my $rule = GetClassSortRule($rule_code); +if ( $op eq 'list' ) { + my $class_sources = Koha::ClassSources->search; + my $sort_rules = Koha::ClassSortRules->search; + my $split_rules = Koha::ClassSplitRules->search; $template->param( - sort_rule_form => 1, - edit_sort_rule => 1, - confirm_op => "edit_sort_rule_confirmed", - sort_rule => $rule_code, - description => $rule->{'description'}, - sort_routine => $rule->{'sort_routine'} + class_sources => $class_sources, + sort_rules => $sort_rules, + split_rules => $split_rules, ); +} - get_class_sort_routines($template, $rule->{'sort_routine'}); +$template->param( op => $op, messages => \@messages, ); +output_html_with_http_headers $input, $cookie, $template->output; -} +exit 0; sub get_class_sort_routines { - my ($template, $current_routine) = @_; - my @sort_routines = GetSortRoutineNames(); - my @sort_form = (); - - foreach my $sort_routine (sort @sort_routines) { - push @sort_form, { - routine => $sort_routine, - selected => $sort_routine eq $current_routine ? 1 : 0 - }; - } - $template->param(routines_dropdown => \@sort_form); - + return \@sort_routines; } -sub edit_class_sort_rule { - my ($template, $rule_code, $description, $sort_routine) = @_; - ModClassSortRule($rule_code, $description, $sort_routine); - $template->param(edited_rule => $rule_code); -} - -sub class_source_list { - my ($template) = @_; - my $sources = GetClassSources(); - - my @sources = (); - foreach my $cn_source (sort keys %$sources) { - my $source = $sources->{$cn_source}; - push @sources, { - code => $source->{'cn_source'}, - description => $source->{'description'}, - used => $source->{'used'}, - sortrule => $source->{'class_sort_rule'} - }; - } - $template->param(class_sources => \@sources); -} - -sub class_sort_rule_list { - - my ($template) = @_; - my $sort_rules = GetClassSortRules(); - - my @sort_rules = (); - foreach my $sort_rule (sort keys %$sort_rules) { - my $sort_rule = $sort_rules->{$sort_rule}; - push @sort_rules, { - rule => $sort_rule->{'class_sort_rule'}, - description => $sort_rule->{'description'}, - sort_routine => $sort_rule->{'sort_routine'} - }; - } - $template->param(class_sort_rules => \@sort_rules); +sub get_class_split_routines { + my @split_routines = qw( + Dewey + Generic + LCC + RegEx + ); + return \@split_routines; } diff --git a/installer/data/mysql/atomicupdate/bug_15836.perl b/installer/data/mysql/atomicupdate/bug_15836.perl index 069b7503f8..edfe012709 100644 --- a/installer/data/mysql/atomicupdate/bug_15836.perl +++ b/installer/data/mysql/atomicupdate/bug_15836.perl @@ -25,7 +25,7 @@ if( CheckVersion( $DBversion ) ) { $dbh->do(q| INSERT INTO class_split_rules(class_split_rule, description, split_routine) VALUES - ('dewey', 'Default sorting rules for DDC', 'dewey'), + ('dewey', 'Default sorting rules for DDC', 'Dewey'), ('lcc', 'Default sorting rules for LCC', 'LCC'), ('generic', 'Generic call number sorting rules', 'Generic') |); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt index c89bfdb486..e8844fb172 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -2,21 +2,17 @@ [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › Classification sources -[% IF ( class_source_form ) %] -› - [% IF ( edit_class_source ) %]Modify classification source[% ELSE %]Add classification source[% END %] -[% END %] -[% IF ( sort_rule_form ) %] +[% IF op == 'add_source' %] › - [% IF ( edit_sort_rule ) %]Modify filing rule[% ELSE %]Add filing rule[% END %] -[% END %] -[% IF ( delete_class_source_form ) %] - › Confirm deletion of classification source [% class_source %] -[% ELSIF ( delete_sort_rule_form ) %] - › Confirm deletion of filing rule [% sort_rule %] -[% ELSIF ( delete_sort_rule_impossible ) %] - › Cannot delete filing rule [% sort_rule %] + [% IF class_source %]Modify classification source[% ELSE %]Add classification source[% END %] +[% ELSIF op == 'add_sort_rule' %] +› + [% IF sort_rule %]Modify filing rule[% ELSE %]Add filing rule[% END %] +[% ELSIF op == 'add_split_rule' %] +› + [% IF split_rule %]Modify splitting rule[% ELSE %]Add splitting rule[% END %] [% END %] + [% INCLUDE 'doc-head-close.inc' %] @@ -29,18 +25,12 @@ HomeAdministrationClassification sources -[% IF ( class_source_form ) %] -› [% IF ( edit_class_source ) %]Modify classification source[% ELSE %]Add classification source[% END %] -[% END %] -[% IF ( sort_rule_form ) %] -› [% IF ( edit_sort_rule ) %]Modify filing rule[% ELSE %]Add filing rule[% END %] -[% END %] -[% IF ( delete_class_source_form ) %] -› Confirm deletion of classification source '[% class_source %]' -[% ELSIF ( delete_sort_rule_form ) %] -› Confirm deletion of filing rule '[% sort_rule %]' -[% ELSIF ( delete_sort_rule_impossible ) %] -› Cannot delete filing rule '[% sort_rule %]' +[% IF op == 'add_source' %] +› [% IF class_source %]Modify classification source[% ELSE %]Add classification source[% END %] +[% ELSIF op == 'add_sort_rule' %] +› [% IF sort_rule %]Modify filing rule[% ELSE %]Add filing rule[% END %] +[% ELSIF op == 'add_split_rule' %] +› [% IF split_rule %]Modify splitting rule[% ELSE %]Add splitting rule[% END %] [% END %] @@ -49,47 +39,107 @@
-[% IF ( class_source_form ) %] - [% IF ( edit_class_source ) %] +[% FOR m IN messages %] +
+ [% SWITCH m.code %] + [% CASE 'error_on_update_source' %] + An error occurred when updating this classification source. + [% CASE 'success_on_update_source' %] + Classification source updated successfully. + [% CASE 'error_on_insert_source' %] + An error occurred when adding this classification source. Perhaps the code already exists? + [% CASE 'success_on_insert_source' %] + Classification source added successfully. + [% CASE 'error_on_delete_source' %] + An error occurred when deleting this classification source. + [% CASE 'success_on_delete_source' %] + Classification source deleted successfully. + [% CASE 'error_on_update_sort_rule' %] + An error occurred when adding this filing rule. Perhaps the code already exists? + [% CASE 'success_on_update_sort_rule' %] + Filing rule updated successfully. + [% CASE 'error_on_insert_sort_rule' %] + An error occurred when adding this filing rule. Perhaps the code already exists? + [% CASE 'success_on_insert_sort_rule' %] + Filing rule added successfully. + [% CASE 'error_on_delete_sort_rule' %] + An error occurred when deleting this filing rule. Perhaps it is used by at least one classification source? + [% CASE 'success_on_delete_sort_rule' %] + Filing rule deleted successfully. + [% CASE 'error_on_update_split_rule' %] + An error occurred when adding this splitting rule. Perhaps the code already exists? + [% CASE 'success_on_update_split_rule' %] + Splitting rule updated successfully. + [% CASE 'error_on_insert_split_rule' %] + An error occurred when adding this splitting rule. Perhaps the code already exists? + [% CASE 'success_on_insert_split_rule' %] + Splitting rule added successfully. + [% CASE 'error_on_delete_split_rule' %] + An error occurred when deleting this splitting rule. Perhaps it is used by at least one classification source? + [% CASE 'success_on_delete_split_rule' %] + Splitting rule deleted successfully. + [% CASE %] + [% m.code %] + [% END %] +
+[% END %] + + +[% IF op == 'add_source' %] + [% IF class_source %]

Modify classification source

[% ELSE %]

Add classification source

[% END %]
- +
  1. - [% IF ( edit_class_source ) %] + [% IF class_source %] Classification source code: - - [% class_source %] + + [% class_source.cn_source %] [% ELSE %] - + Required [% END %]
  2. - + Required
  3. - [% IF ( used ) %][% ELSE %] + [% IF ( class_source.used ) %][% ELSE %] [% END %]
  4. -
  5. - - Required -
  6. +
  7. + + + Required +
  8. +
  9. + + + Required +
@@ -99,38 +149,38 @@ [% END %] -[% IF ( sort_rule_form ) %] - [% IF ( edit_sort_rule ) %] +[% IF op == 'add_sort_rule' %] + [% IF sort_rule %]

Modify filing rule

[% ELSE %]

Add filing rule

[% END %]
- +
  1. - [% IF ( edit_sort_rule ) %] + [% IF sort_rule %] Filing rule code: - - [% sort_rule %] + + [% sort_rule.class_sort_rule %] [% ELSE %] - - + + Required [% END %]
  2. - + Required
  3. @@ -145,100 +195,93 @@
  4. [% END %] -[% IF ( delete_class_source_form ) %] -
    -

    Confirm deletion of classification source '[% class_source %]'?

    -
    - - - -
    -
    - -
    -
    -[% END %] +[% IF op == 'add_split_rule' %] + [% IF split_rule %] +

    Modify splitting rule

    + [% ELSE %] +

    Add splitting rule

    + [% END %] +
    + +
    +
      +
    1. + [% IF split_rule %] + Splitting rule code: + + [% split_rule.class_split_rule %] + [% ELSE %] + + + Required + [% END %] +
    2. +
    3. + + Required +
    4. +
    5. + + Required +
    6. +
    7. + + + Required +
    8. -[% IF ( delete_sort_rule_form ) %] -
      -

      Confirm deletion of filing rule '[% sort_rule %]'?

      - - - - - -
      - -
      -
      +
    +
    +
    + + Cancel +
    + [% END %] -[% IF ( delete_sort_rule_impossible ) %] -

    Cannot delete filing rule '[% sort_rule %]'

    -

    The filing rule [% sort_rule %] is used by at least one classification source. Please - remove it from all classification source definitions before trying again. -

    -
    - -
    -
    -[% END %] -[% IF ( display_lists ) %] +[% IF op == 'list' %]

    Classification sources

    -[% IF ( added_source ) %] -
    Added classification source [% added_source %]
    -[% END %] -[% IF ( edited_source ) %] -
    Modified classification source [% edited_source %]
    -[% END %] -[% IF ( deleted_source ) %] -
    Deleted classification source [% deleted_source %]
    -[% END %] -[% IF ( failed_add_source ) %] -
    Failed to add classification source [% failed_add_source %]. Perhaps the code already exists?
    -[% END %] + [% FOREACH class_source IN class_sources %] - + - + + [% END %]
    Code Description In use Filing ruleSplitting rule Actions
    [% class_source.code %][% class_source.cn_source %] [% class_source.description |html %] [% IF ( class_source.used ) %]Yes[% ELSE %]No[% END %][% class_source.sortrule %][% class_source.class_sort_rule %][% class_source.class_split_rule %] - Edit - Delete + Edit + Delete

    Classification filing rules

    -[% IF ( added_rule ) %] -
    Added filing rule [% added_rule %]
    -[% END %] -[% IF ( edited_rule ) %] -
    Modified filing rule [% edited_rule %]
    -[% END %] -[% IF ( deleted_rule ) %] -
    Deleted filing rule [% deleted_rule %]
    -[% END %] -[% IF ( failed_add_rule ) %] -
    Failed to add filing rule [% failed_add_rule %]. Perhaps the code already exists?
    -[% END %] @@ -246,19 +289,41 @@ - [% FOREACH class_sort_rule IN class_sort_rules %] + [% FOREACH rule IN sort_rules %] - - - + + + [% END %]
    CodeSorting routine Actions
    [% class_sort_rule.rule %][% class_sort_rule.description |html %][% class_sort_rule.sort_routine %][% rule.class_sort_rule %][% rule.description |html %][% rule.sort_routine %] - Edit - Delete + Edit + Delete
    +

    Classification splitting rules

    + + + + + + + + [% FOREACH rule IN split_rules %] + + + + + + + [% END %] +
    CodeDescriptionSplitting routineActions
    [% rule.class_split_rule |html %][% rule.description |html %][% rule.split_routine %] + Edit + Delete +
    + + [% END %]
@@ -270,5 +335,34 @@ [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") %] + + [% END %] [% INCLUDE 'intranet-bottom.inc' %] -- 2.11.0