Changeset 77 for server

Timestamp:

12/05/10 17:43:24 (14 years ago)

Author:

nanardon

Message:

• add distrib selection to explorer

Location:

server/trunk/web

Files:

• lib/Sophie.pm (modified) (1 diff)
• lib/Sophie/Controller/Ajax (added)
• lib/Sophie/Controller/Ajax/Forms.pm (added)
• lib/Sophie/Controller/Chat/Cmd.pm (modified) (2 diffs)
• lib/Sophie/Controller/Explorer.pm (modified) (1 diff)
• lib/Sophie/Controller/Root.pm (modified) (1 diff)
• root/templates/html/ajax (added)
• root/templates/html/ajax/forms (added)
• root/templates/html/ajax/forms/distribselect.tt (added)
• root/templates/html/explorer/index.html (modified) (1 diff)
• t/controller_Ajax-Forms.t (added)
• t/controller_Distrib.t (modified) (1 diff)

server/trunk/web/lib/Sophie.pm

@@ -24 +24 @@
     Authentication
     Authorization::Roles
+    Prototype
 /;
 

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

@@ -38 +38 @@
         message => [
             'availlable command:',
-            join(', ', @{ $self->_commands }),
+            join(', ', grep { $_ !~ /^end$/ } @{ $self->_commands }),
         ],
     }
@@ -47 +47 @@
     my ( $self, $c ) = @_;
     return $c->stash->{xmlrpc} = {
-        message => [ 'Sophie ' . $Sophie::VERSION . ' Chat: ' . q$Rev$ ],
+        message => [ 'Sophie: ' . $Sophie::VERSION . ', Chat ' . q$Rev$ ],
     };
 }
 
+sub end : Private {
+    my ($self, $c ) = @_;
+    my $reqspec = $c->req->arguments->[0];
 
+    $c->forward('/end');
+}
 
 =head1 AUTHOR

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

@@ -31 +31 @@
             arch => $c->req->param('arch') || undef,
         };
+    } else {
+        foreach (qw(distribution release arch)) {
+            $c->req->params->{$_} = $c->session->{explorer}{$_}
+        }
     }
+
     $c->session->{__explorer} = $c->session->{explorer};
 

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

@@ -54 +54 @@
     if ($c->action =~ m/^admin\//) {
         if (!($c->user_exists && $c->check_user_roles($c->user, 'Admin'))) {
-            $c->res->redirect($c->uri_for('/login'));
+            #$c->go('/login/index');
         }
     }

server/trunk/web/root/templates/html/explorer/index.html

@@ -1 +1 @@
 
-<!-- <p>
-<a href="[% c.uri_for('/explorer') %]">/</a>
-[% FOREACH p = eachpath %]
-<a href="[% c.uri_for('/explorer', p.path) %]">[% p.dir | html %]</a>
-[% END %]
-</p>-->
+<form action="[% c.uri_for('/', c.req.path) %]" id="explorer_d">
+    <span id="distribselect">
+    [% INCLUDE 'ajax/forms/distribselect.tt' %]
+    </span>
+    <input type="submit" value="Update view...">
+</form>
+[% c.prototype.observe_form('explorer_d',
+    {
+    url => c.uri_for('/ajax/forms/distribselect', { 'ajax' => 1 }),
+    frequency => 1,
+    update => 'distribselect',
+    }
+) %]
+
 
 <div id="exp_dir" style="float: left; border: outset; width: 30%">

server/trunk/web/t/controller_Distrib.t

@@ -47 +47 @@
     request("/distrib/$distribution/$release/$arch/media/$media/by-pkgid/$pkgid/changelog")
     ->is_success, "request media/pkgid/changelog");
+
+ok(
+    request("/distrib/$distribution/$release/$arch/rpms/$rpmname")
+    ->is_success, "request rpms/$rpmname");
+ok(
+    request("/distrib/$distribution/$release/$arch/srpms/$rpmname")
+    ->is_success, "request srpms/$rpmname");
+
+
 done_testing();