seasharp
/
anvil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed a bug with the 'Back' button when going back from the fence configuration confirmation screen.

Browse Source 
Signed-off-by: Digimer <digimer@alteeve.ca>
main
Digimer 5 years ago
parent f71c16484a
commit 1f17c9dcfe
3 changed files with 30 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      cgi-bin/striker
  2. 14
      html/skins/alteeve/anvil.html
  3. 2
      share/words.xml

24
cgi-bin/striker
Unescape View File

@ -1633,10 +1633,12 @@ sub sanity_check_fence_agent_form
}}); }});
} }
$anvil->data->{fence}{confirm_table}{data}{$name}{$i}{'default'} = $is_default; $anvil->data->{fence}{confirm_table}{data}{$name}{$i}{'default'} = $is_default;
$anvil->data->{fence}{confirm_table}{data}{$name}{$i}{value} = $say_value; $anvil->data->{fence}{confirm_table}{data}{$name}{$i}{value} = $passed_value ? $passed_value : $default;
$anvil->data->{fence}{confirm_table}{data}{$name}{$i}{say_value} = $say_value;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"fence::confirm_table::data::${name}::${i}::default" => $anvil->data->{fence}{confirm_table}{data}{$name}{$i}{'default'}, "fence::confirm_table::data::${name}::${i}::default" => $anvil->data->{fence}{confirm_table}{data}{$name}{$i}{'default'},
"fence::confirm_table::data::${name}::${i}::value" => $anvil->data->{fence}{confirm_table}{data}{$name}{$i}{value}, "fence::confirm_table::data::${name}::${i}::value" => $anvil->data->{fence}{confirm_table}{data}{$name}{$i}{value},
"fence::confirm_table::data::${name}::${i}::say_value" => $anvil->data->{fence}{confirm_table}{data}{$name}{$i}{say_value},
}}); }});
} }
} }
@ -1714,17 +1716,20 @@ sub process_fences
foreach my $i (sort {$a cmp $b} keys %{$anvil->data->{fence}{confirm_table}{data}{$name}}) foreach my $i (sort {$a cmp $b} keys %{$anvil->data->{fence}{confirm_table}{data}{$name}})
{ {
my $is_default = $anvil->data->{fence}{confirm_table}{data}{$name}{$i}{'default'}; my $is_default = $anvil->data->{fence}{confirm_table}{data}{$name}{$i}{'default'};
my $say_value = $anvil->data->{fence}{confirm_table}{data}{$name}{$i}{say_value};
my $value = $anvil->data->{fence}{confirm_table}{data}{$name}{$i}{value}; my $value = $anvil->data->{fence}{confirm_table}{data}{$name}{$i}{value};
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
's1:name' => $name, 's1:name' => $name,
's2:i' => $i, 's2:i' => $i,
's3:is_default' => $is_default, 's3:is_default' => $is_default,
's4:value' => $value, 's4:value' => $value,
's5:say_value' => $say_value,
}}); }});
$entry_row .= $anvil->Template->get({file => "anvil.html", name => "fence-agent-column-hidden-value", variables => { $entry_row .= $anvil->Template->get({file => "anvil.html", name => "fence-agent-column-hidden-value", variables => {
class => $is_default ? "default_value" : "changed_value", class => $is_default ? "default_value" : "changed_value",
name => $name."_".$i, name => $name."_".$i,
value => $value, value => $value,
say_value => $say_value,
}}); }});
} }
$confirm_table .= $anvil->Template->get({file => "anvil.html", name => "fence-agent-row", variables => { $confirm_table .= $anvil->Template->get({file => "anvil.html", name => "fence-agent-row", variables => {
@ -1732,10 +1737,13 @@ sub process_fences
}}); }});
} }
# Are we asking the user to confirm one or more?
my $confirm_string = $anvil->data->{cgi}{fence_count}{value} == 1 ? "#!string!striker_0222!#" : "#!string!striker_0221!#";
$anvil->data->{form}{back_link} = "?anvil=true&task=fences"; $anvil->data->{form}{back_link} = "?anvil=true&task=fences";
$anvil->data->{form}{body} = $anvil->Template->get({file => "anvil.html", name => "fence-agent-confirm", variables => { $anvil->data->{form}{body} = $anvil->Template->get({file => "anvil.html", name => "fence-agent-confirm", variables => {
table => $confirm_table, table => $confirm_table,
span_count => $anvil->data->{cgi}{fence_count}{value}, span_count => $anvil->data->{cgi}{fence_count}{value},
confirm_string => $confirm_string,
}}); }});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 'form::body' => $anvil->data->{form}{body} }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 'form::body' => $anvil->data->{form}{body} }});
return(0); return(0);

14
html/skins/alteeve/anvil.html
Unescape View File

@ -141,7 +141,7 @@
<!-- start fence-agent-column-hidden-value --> <!-- start fence-agent-column-hidden-value -->
<td class="column_row_value_centered_border"> <td class="column_row_value_centered_border">
<span class="#!variable!class!#">#!variable!value!#</span> <span class="#!variable!class!#">#!variable!say_value!#</span>
<input type="hidden" name="#!variable!name!#" id="#!variable!name!#" value="#!variable!value!#" /> <input type="hidden" name="#!variable!name!#" id="#!variable!name!#" value="#!variable!value!#" />
</td> </td>
<!-- end fence-agent-column-hidden-value --> <!-- end fence-agent-column-hidden-value -->
@ -167,10 +167,20 @@
&nbsp; &nbsp;
</td> </td>
</tr> </tr>
<tr>
<td colspan="2">
#!variable!confirm_string!#
</td>
</tr>
<tr>
<td colspan="2">
&nbsp;
</td>
</tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<form name="conce_configuration" action="" method="post"> <form name="conce_configuration" action="" method="post">
<table class="data_table"> <table class="centered">
#!variable!table!# #!variable!table!#
<tr> <tr>
<td class="close_top"> <td class="close_top">

2
share/words.xml
Unescape View File

@ -1090,6 +1090,8 @@ If you are comfortable that the target has changed for a known reason, you can s
<key name="striker_0218">Note: Names and descriptions come from the fence agent itself. If you need more help, please run 'man #!variable!name!#' at the command line.</key> <key name="striker_0218">Note: Names and descriptions come from the fence agent itself. If you need more help, please run 'man #!variable!name!#' at the command line.</key>
<key name="striker_0219">Required field</key> <key name="striker_0219">Required field</key>
<key name="striker_0220">Device #!variable!number!#:</key> <key name="striker_0220">Device #!variable!number!#:</key>
<key name="striker_0221">Please confirm the fence devices are configured the way you like.</key>
<key name="striker_0222">Please confirm the fence device is configured the way you like.</key>
<!-- These are generally units and appended to numbers --> <!-- These are generally units and appended to numbers -->
<key name="suffix_0001">#!variable!number!#/sec</key> <key name="suffix_0001">#!variable!number!#/sec</key>

Write Preview
Loading…
Cancel
Save