[Jifty-commit] r4487 - in apps/spensive: . lib/Spensive lib/Spensive/View

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Tue Nov 20 12:11:08 EST 2007


Author: jesse
Date: Tue Nov 20 12:11:06 2007
New Revision: 4487

Modified:
   apps/spensive/   (props changed)
   apps/spensive/etc/config.yml
   apps/spensive/lib/Spensive/Dispatcher.pm
   apps/spensive/lib/Spensive/View.pm
   apps/spensive/lib/Spensive/View/Expenses.pm

Log:
 r67460 at pinglin (orig r7370):  jesse | 2007-09-20 14:28:43 -0400
 snap


Modified: apps/spensive/etc/config.yml
==============================================================================
--- apps/spensive/etc/config.yml	(original)
+++ apps/spensive/etc/config.yml	Tue Nov 20 12:11:06 2007
@@ -31,10 +31,10 @@
             from: spensive-feedback at spensive.fsck.com
             to: sarohapri at my.hiveminder.com
         - CompressedCSSandJS:
-            css: 0
+            css: 1
             js: 1
+            jsmin: /usr/local/bin/jsmin
         - Authentication::Password: {}
-        - OpenID: {}
   PubSub: 
     Backend: Memcached
     Enable: ~
@@ -50,6 +50,7 @@
       error_mode: fatal
     Port: 8888
     ServeStaticFiles: 1
+#    ServerClass: Jifty::Server::Prefork
     StaticRoot: share/web/static
     TemplateRoot: share/web/templates
 application:

Modified: apps/spensive/lib/Spensive/Dispatcher.pm
==============================================================================
--- apps/spensive/lib/Spensive/Dispatcher.pm	(original)
+++ apps/spensive/lib/Spensive/Dispatcher.pm	Tue Nov 20 12:11:06 2007
@@ -47,6 +47,13 @@
 };
 on '/expense/#' => run {
     my $id = $1;
+    my $e = Jifty->web->navigation->child('Expenses');
+    $e->child(This => label => 'This expense', url => '/expense/'.$id);
+    
+};
+
+on '/expense/#' => run {
+    my $id = $1;
     my $expense = Spensive::Model::Expense->new();
     $expense->load($id);
     set 'expense' => $expense;

Modified: apps/spensive/lib/Spensive/View.pm
==============================================================================
--- apps/spensive/lib/Spensive/View.pm	(original)
+++ apps/spensive/lib/Spensive/View.pm	Tue Nov 20 12:11:06 2007
@@ -153,11 +153,16 @@
     );
     $untied->limit( column => 'expense_report', operator => 'is', value => 'null', entryaggregator => 'or');
     $untied->limit( column => 'expense_report', operator => '=', value => '');
+
+    h3 { 'Open expenses'};
+
        while (my $item = $untied->next) {
-        render_region (name => 'expense-'.$item->id,
-                        path => 'report/add_expense',
-                            defaults => { id => $item->id, report => $report->id});
+        render_region (name => 'expense-'.$item->id, path => 'report/add_expense', defaults => { id => $item->id, report => $report->id});
+
 }
+
+    h3 { 'A new expense' };
+        render_region (name => 'expense-new', path => 'report/new_expense', defaults => { report => $report->id});
 };
 template 'remove_reports' => sub {
     my $report_id = get('report');
@@ -177,6 +182,15 @@
 
 
 
+template 'report/new_expense' => sub {
+    my $report = get('report');
+    my $action = Jifty->web->new_action( class    => 'CreateExpense', arguments => {expense_report => $report});
+    form {
+        render_action($action);
+    outs_raw($action->button( label => 'Add', onclick=> [{submit => $action, }, { refresh_self => 1}]));
+    }
+};
+
 
 template 'report/add_expense' => sub {
     my $report = get('report');

Modified: apps/spensive/lib/Spensive/View/Expenses.pm
==============================================================================
--- apps/spensive/lib/Spensive/View/Expenses.pm	(original)
+++ apps/spensive/lib/Spensive/View/Expenses.pm	Tue Nov 20 12:11:06 2007
@@ -29,6 +29,10 @@
     my $expenses =$collateral->join(alias1 => $email_alias, column1 => 'expense', table2 => 'expenses', column2 => 'id');
     $collateral->limit(alias => $expenses, column => 'id', value => $expense->id);
 
+    h1 { $expense->title};
+    h2 { $expense->description};
+    div { {class is 'cost'}; $expense->cost};
+
     while (my $item = $collateral->next) {
     
         if ($item->content_type =~ /^image/i) {


More information about the Jifty-commit mailing list