Changeset 217 for trunk/lib/Vote/DB/Poll.pm

Timestamp:

04/18/09 04:57:22 (15 years ago)

Author:

nanardon

Message:

• make difference between settings and their raw value
• simplify template
• allow to have a different number of elected people than choice in ballot

File:

• trunk/lib/Vote/DB/Poll.pm (modified) (5 diffs)

trunk/lib/Vote/DB/Poll.pm

@@ -128 +128 @@
 }
 
-sub info {
+sub raw_info {
     my ($self, $var) = @_;
-
-    my $default = {
-        free_choice => 0, # avoid undef in some case
-    };
 
     if ($var) {
@@ -145 +141 @@
             my $res = $sth->fetchrow_hashref;
             $sth->finish;
-            return defined($res->{val})
-                ? $res->{val}
-                : $default->{$var};
+            return $res->{val}
         }
     }
@@ -159 +153 @@
             $res->{$set->{var}} = $set->{val};
         }
+        return $res
+    }
+    return;
+}
+
+sub info {
+    my ($self, $var) = @_;
+
+    my $default = {
+        free_choice => 0, # avoid undef in some case
+        elected_count => $self->raw_info('choice_count'),
+    };
+
+    if ($var) {
+        my $val = $self->raw_info($var);
+        return defined($val)
+            ? $val
+            : $default->{$var};
+    } elsif (my $res = $self->raw_info) {
         foreach (keys %$default) {
             $res->{$_} = $default->{$_} if (!defined($res->{$_}));
@@ -164 +177 @@
         return $res
     }
+    return;
 }
 
@@ -169 +183 @@
     my ($self, $var, $val) = @_;
 
+    $val = undef if(defined($val) && $val eq '');
     my $upd = $self->db->prepare_cached(
         q{update settings set val = ? where poll = ? and var = ?}