redisplay enum types too on error

lib/admin/Controller/peering.pm

@@ -546,8 +546,19 @@ sub preferences : Local {
                                                       );
     $db_prefs = [ grep { $$_{peer_pref} } @$db_prefs ] if eval { @$db_prefs };
     
+    ### restore data entered by the user ###
+
+    if(ref $c->session->{restore_preferences_input} eq 'HASH') {
+        if(ref $preferences eq 'HASH') {
+            $preferences = { %$preferences, %{$c->session->{restore_preferences_input}} };
+        } else {
+            $preferences = $c->session->{restore_preferences_input};
+        }
+        delete $c->session->{restore_preferences_input};
+    }
+    
+    # need to find and provide avaiable options for enum types
     foreach my $pref (@$db_prefs) {
-        # need to find and provide avaiable options for enum types
         if ($$pref{data_type} eq 'enum') {
             
             my $enum_options;
@@ -564,17 +575,6 @@ sub preferences : Local {
         }
     }
 
-    ### restore data entered by the user ###
-
-    if(ref $c->session->{restore_preferences_input} eq 'HASH') {
-        if(ref $preferences eq 'HASH') {
-            $preferences = { %$preferences, %{$c->session->{restore_preferences_input}} };
-        } else {
-            $preferences = $c->session->{restore_preferences_input};
-        }
-        delete $c->session->{restore_preferences_input};
-    }
-
     if(eval { @$db_prefs }) {
         $c->stash->{preferences_array} = admin::Utils::prepare_tt_prefs($c, $db_prefs, $preferences);
     }