Changeset 381

Timestamp:

09/29/11 18:11:47 (13 years ago)

Author:

nanardon

Message:

• add unset bot function
• fix default setting deletion

Location:

server/trunk/web/lib/Sophie/Controller

Files:

• Chat/Cmd.pm (modified) (4 diffs)
• User.pm (modified) (1 diff)

server/trunk/web/lib/Sophie/Controller/Chat/Cmd.pm

@@ -174 +174 @@
 =head2 set [distribution|release|arch] value
 
-Set default search value
+Set default search value (see also: unset)
 
 =cut
@@ -185 +185 @@
     return $c->stash->{xmlrpc} = {
         private_reply => 1,
-        message => [ "$var set to: " . ($val || '(none)') ],
+        message => [
+            "$var set to: " . ($val || '(none)'),
+            ($c->forward('/distrib/exists', [
+                    $c->forward('/user/fetchdata', [ $reqspec->{from}, ]) ])
+                ? ()
+                : ("warning: your setting does not match any distribution")
+            ),
+        ]
+    };
+}
+
+=head2 unset [distribution|release|arch]
+
+Unset default search value (see also: set)
+
+=cut
+
+sub unset : XMLRPC {
+    my ( $self, $c, $reqspec, $var ) = @_;
+
+    $c->forward('/user/update_data', [ $reqspec->{from}, { $var => undef } ]);
+    
+    return $c->stash->{xmlrpc} = {
+        private_reply => 1,
+        message => [ "$var set to: (none)" ],
     };
 }
@@ -213 +237 @@
         };
     } else {
-        warn my $own = $c->forward('_fmt_question', [$res]);
-        warn my $applied = $c->forward('_fmt_question', [$reqspec]);
+        my $own = $c->forward('_fmt_question', [$res]);
+        my $applied = $c->forward('_fmt_question', [$reqspec]);
+
         return $c->stash->{xmlrpc} = {
             message => [ sprintf('your setting is: %s%s',
@@ -222 +247 @@
                     : ''
                 )
-            ) ],
+            ),
+            ($c->forward('/distrib/exists', [ $res ])
+                ? ()
+                : ("warning: your setting does not match any distribution")
+            )
+            ],
         }
     }

server/trunk/web/lib/Sophie/Controller/User.pm

@@ -111 +111 @@
 
     foreach (keys %$data) {
-        $prev_data->{$_} = $data->{$_};
+        if (defined($data->{$_})) {
+            $prev_data->{$_} = $data->{$_};
+        } else {
+            delete($prev_data->{$_});
+        }
     }