[Jifty-commit] r2137 - in jifty/branches/template-declare: .
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Sun Nov 12 04:50:17 EST 2006
Author: jesse
Date: Sun Nov 12 04:50:17 2006
New Revision: 2137
Modified:
jifty/branches/template-declare/ (props changed)
jifty/branches/template-declare/lib/Jifty/View/Declare/Handler.pm
jifty/branches/template-declare/lib/Jifty/View/Declare/Templates.pm
Log:
r44759 at pinglin: jesse | 2006-11-12 04:49:51 -0500
* Wifty seems to work
Modified: jifty/branches/template-declare/lib/Jifty/View/Declare/Handler.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/View/Declare/Handler.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/View/Declare/Handler.pm Sun Nov 12 04:50:17 2006
@@ -49,18 +49,15 @@
sub resolve_template {
my $self = shift;
my $templatename = shift; # like /admin/ui/new
- warn "Looking at $templatename";
my @components = split( '/', $templatename );
my $template = pop @components;
- warn "The tempalte is $template";
my $package = join('::',$self->root_class,grep { $_ } @components);
- warn "The package is $package";
Jifty::Util->require($package);
unless ( $package->isa('Jifty::View::Declare::Templates') ) {
$self->log->error( "$package (" . $self->root_class . " / $templatename) isn't a valid template package." );
- #return undef;
+ return undef;
}
unless ( $package->can('has_template') && $package->has_template($template) ) {
$self->log->error("$package has no template $template.");
Modified: jifty/branches/template-declare/lib/Jifty/View/Declare/Templates.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/View/Declare/Templates.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/View/Declare/Templates.pm Sun Nov 12 04:50:17 2006
@@ -6,7 +6,7 @@
use Template::Declare::Tags;
use base qw/Template::Declare/;
-our @EXPORT = qw(form hyperlink tangent redirect new_action form_submit form_next_page request get);
+our @EXPORT = qw(form hyperlink tangent redirect new_action form_submit form_next_page request get param current_user);
sub form (&){
@@ -16,26 +16,31 @@
Jifty->web->form->start;
outs($code->());
Jifty->web->form->end;
+ return ''
}
sub hyperlink(@) {
- Jifty->web->link(@_);
+ outs (Jifty->web->link(@_));
+ return '';
}
sub tangent(@) {
- Jifty->web->tangent(@_);
+ outs (Jifty->web->tangent(@_));
+ return '';
}
sub redirect(@) {
Jifty->web->redirect(@_);
+ return ''
}
sub new_action(@){
- Jifty->web->new_action(@_);
+ return Jifty->web->new_action(@_);
}
sub form_submit(@){
- Jifty->web->form->submit(@_);
+ outs( Jifty->web->form->submit(@_));
+ '';
}
sub form_next_page(@){
@@ -46,8 +51,18 @@
Jifty->web->request;
}
+sub current_user {
+ Jifty->web->current_user;
+}
+
sub get {
return map { request->argument($_) } @_;
}
+sub param {
+ my $action = shift;
+ outs($action->form_field(@_));
+ '';
+}
+
1;
More information about the Jifty-commit
mailing list