Changeset 326

Timestamp:

01/18/11 01:06:09 (13 years ago)

Author:

nanardon

Message:

• add a link to register default distrubution in analyse

Location:

server/trunk/web

Files:

• lib/Sophie/Controller/Rpms.pm (modified) (1 diff)
• lib/Sophie/Controller/User/Prefs.pm (added)
• root/templates/html/analysis/index.tt (modified) (1 diff)
• root/templates/html/rpms/analyse.html (modified) (1 diff)
• root/templates/html/user/prefs (added)
• root/templates/html/user/prefs/set_default_distrib.html (added)
• t/controller_User-Prefs.t (added)

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

@@ -549 +549 @@
     $pkgid ||= $c->stash->{pkgid};
     $c->stash->{rpmurl} = ($c->req->path =~ m:(.*)/[^/]+:)[0];
-    $dist->{distribution} ||= $c->req->param('distribution');
-    $dist->{release} ||= $c->req->param('release');
-    $dist->{arch} ||= $c->req->param('arch');
     if ($c->req->param('start')) {
+        $dist->{distribution} = $c->req->param('distribution');
+        $dist->{release} = $c->req->param('release');
+        $dist->{arch} = $c->req->param('arch');
         $c->session->{analyse} = $dist;
     } elsif (! $c->req->xmlrpc->is_xmlrpc_request) {
+        $dist ||= $c->forward('/user/prefs/get_default_distrib');
+        foreach (qw(distribution release arch)) {
+            $c->req->params->{$_} = $dist->{$_};
+        }
+    }
+    warn Data::Dumper::Dumper($dist);
+
+    if ($c->req->param('analyse') || $c->req->xmlrpc->is_xmlrpc_request) {
         $dist = $c->session->{analyse};
-    }
-
-    if ($c->req->param('analyse') || $c->req->xmlrpc->is_xmlrpc_request) {
 
         my @deplist = map {

server/trunk/web/root/templates/html/analysis/index.tt

@@ -21 +21 @@
     [% INCLUDE 'ajax/forms/distribselect.tt' form = 'analysis_form' %]
     </span>
+
 <input type="submit" name="analyse">
 </form>

server/trunk/web/root/templates/html/rpms/analyse.html

@@ -11 +11 @@
     [% INCLUDE 'ajax/forms/distribselect.tt' form = 'analysis_form' %]
     </span>
+
     <input type="submit" name="start">
+    [% c.prototype.link_to_remote( '<img src="' _ 
+        c.uri_for('/static/images/openicons/32x32', 'page_text_check.png') _
+        '" title="Set this choice as default" alt="Set" style="height: 1em">', {
+            url      => c.uri_for('/user/prefs/set_default_distrib'),
+            with     => "Form.serialize('analysis_form')",
+            }, { entities => '' }, ) %]
 </form>