From 3971d9bd4f46dcca2b1888fa96e8de5947da0bdd Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Tue, 23 Feb 2010 11:15:54 -0800
Subject: [PATCH] Fix Interval form value preservation, when the field is
 hidden.  Fixes bug #11431.

---
 docs/changelog/7.x.x.txt    |  1 +
 lib/WebGUI/Form/Interval.pm | 59 ++++++++++++++++++++++++-------------
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index ecc287c1b..d9fc28893 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -4,6 +4,7 @@
  - fixed #11414: SQLReport Pagination Setting
  - fixed #11420: Snippet not save mimetype
  - fixed #11422: Disabled scheduled task run by spectre
+ - fixed #11431: Prototypes cache attribute lost
 
 7.8.12
  - fixed #11285: Pasting HTML into Code Editor in IE
diff --git a/lib/WebGUI/Form/Interval.pm b/lib/WebGUI/Form/Interval.pm
index 1cca61f3c..e39d53a58 100644
--- a/lib/WebGUI/Form/Interval.pm
+++ b/lib/WebGUI/Form/Interval.pm
@@ -95,6 +95,29 @@ sub getName {
 
 #-------------------------------------------------------------------
 
+=head2 getUnitOptions (  )
+
+Returns a hash with i18n labels and values for units of time.
+
+=cut
+
+sub getUnitOptions {
+    my $self = shift;
+    tie my %units, 'Tie::IxHash';
+    my $i18n = WebGUI::International->new($self->session);
+    %units = (seconds => $i18n->get(704),
+              minutes => $i18n->get(705),
+              hours   => $i18n->get(706),
+              days    => $i18n->get(700),
+              weeks   => $i18n->get(701),
+              months  => $i18n->get(702),
+              years   => $i18n->get(703),
+    );
+    return %units;
+}
+
+#-------------------------------------------------------------------
+
 =head2 getValue ( [ num_and_units ] )
 
 Returns either the interval that was posted (in seconds) or if nothing comes back it returns 0.
@@ -165,17 +188,7 @@ Renders an interval control.
 
 sub toHtml {
     my $self = shift;
-    my %units;
-    tie %units, 'Tie::IxHash';
-    my $i18n = WebGUI::International->new($self->session);
-    %units = (seconds => $i18n->get(704),
-              minutes => $i18n->get(705),
-              hours   => $i18n->get(706),
-              days    => $i18n->get(700),
-              weeks   => $i18n->get(701),
-              months  => $i18n->get(702),
-              years   => $i18n->get(703),
-    );
+    my %units = $self->getUnitOptions();
     my %reverseUnits = reverse %units;
     my ($interval, $units) = $self->session->datetime->secondsToExactInterval($self->getOriginalValue);
     # not sure why, but these things need to be defined like this or
@@ -208,16 +221,20 @@ Returns the field as hidden controls rather than displayable controls.
 =cut
 
 sub toHtmlAsHidden {
-	my $self = shift;
-        my ($interval, $units) = $self->session->datetime->secondsToExactInterval($self->getOriginalValue);
-        return WebGUI::Form::Hidden->new($self->session,
-                        name=>$self->get("name").'_interval',
-                        value=>$interval
-                        )->toHtmlAsHidden
-        	.WebGUI::Form::Hidden->new($self->session,
-                        name=>$self->get("name").'_units',
-                        value=>$units
-                        )->toHtmlAsHidden;
+    my $self    = shift;
+    my $session = $self->session;
+    my %units   = $self->getUnitOptions();
+    my %reverseUnits = reverse %units;
+    my ($interval, $units) = $session->datetime->secondsToExactInterval($self->getOriginalValue);
+    my $unitVal = $reverseUnits{$units};
+    return WebGUI::Form::Hidden->new($session,
+                    name  => $self->get("name").'_interval',
+                    value => $interval,
+           )->toHtmlAsHidden
+         . WebGUI::Form::Hidden->new($session,
+                    name  => $self->get("name").'_units',
+                    value => $unitVal,
+          )->toHtmlAsHidden;
 }
 
 1;