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

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Tue Nov 20 12:09:54 2007
New Revision: 4477

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
   apps/spensive/lib/Spensive/View/Reports.pm

Log:
 r60279 at pinglin (orig r6786):  jesse | 2007-07-09 05:04:58 -0400
 


Modified: apps/spensive/etc/config.yml
==============================================================================
--- apps/spensive/etc/config.yml	(original)
+++ apps/spensive/etc/config.yml	Tue Nov 20 12:09:54 2007
@@ -1,5 +1,6 @@
 --- 
 framework: 
+  ConfigFileVersion: 2
   AdminMode: 1
   ApplicationClass: Spensive
   ApplicationName: Spensive
@@ -13,7 +14,7 @@
     RecordBaseClass: Jifty::DBI::Record::Cachable
     User: ''
     Version: 0.0.3
-  DevelMode: 1
+  DevelMode: 0
   L10N: 
     PoDir: share/po
   LogLevel: DEBUG
@@ -21,8 +22,14 @@
   MailerArgs: []
 
   Plugins: 
+        - SkeletonApp: {}
+        - ErrorTemplates: {}
+        - REST: {}
         - LetMe: {}
         - User: {}
+        - CompressedCSSandJS:
+            css: 1
+            js: 1
         - Authentication::Password: {}
         - OpenID: {}
   PubSub: 

Modified: apps/spensive/lib/Spensive/Dispatcher.pm
==============================================================================
--- apps/spensive/lib/Spensive/Dispatcher.pm	(original)
+++ apps/spensive/lib/Spensive/Dispatcher.pm	Tue Nov 20 12:09:54 2007
@@ -7,18 +7,16 @@
 
 
 before qr'^/(?!(?:login|signup|__jifty))' => run {
-               unless(Jifty->web->current_user->id) {
-                   Jifty->web->tangent( url => '/login');
-               }
-           };
-
+    unless ( Jifty->web->current_user->id ) {
+        Jifty->web->tangent( url => '/login' );
+    }
+};
 
 on qr'/report/(\d+)/build' => run {
     my $report = Spensive::Model::ExpenseReport->new();
     $report->load($1);
-    set (report => $report);
+    set( report => $report );
     show 'report/build';
-}
-
+    };
 
 1;

Modified: apps/spensive/lib/Spensive/View.pm
==============================================================================
--- apps/spensive/lib/Spensive/View.pm	(original)
+++ apps/spensive/lib/Spensive/View.pm	Tue Nov 20 12:09:54 2007
@@ -49,14 +49,14 @@
 require Spensive::View::Reports;
 alias Spensive::View::Reports under 'reports/';
 
-  use Jifty::Plugin::TabView::View;
+use Jifty::Plugin::TabView::View;
 
 template 'report/build' => page {
            my $self = shift;
     h1 { get('report')->title };
            render_region( name => 'reports', path => 'report_tabs', defaults => { report => get('report')->id});
                   
-            
+        outs_raw(Jifty->web->return(label => 'Done'));      
 };
 
 template report_tabs => sub {

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:09:54 2007
@@ -3,25 +3,12 @@
 use warnings;
 
 use Jifty::View::Declare -base;
-use Jifty::View::Declare::CRUD;
-
-import_templates Jifty::View::Declare::CRUD under '/';
+use base 'Jifty::View::Declare::CRUD';
 
 sub fragment_base_path {'/expenses'}
 
 sub object_type { 'Expense' }
 
-
-template 'index.html' => page {
-    title is  'Expenses' ;
-    form {  
-            render_region(
-                name     => 'newslist',
-                path     => 'expenses/list');
-    }
-
-};
-
 sub display_columns { return (qw(title cost date_incurred  payment_method description)); };
 
 1;

Modified: apps/spensive/lib/Spensive/View/Reports.pm
==============================================================================
--- apps/spensive/lib/Spensive/View/Reports.pm	(original)
+++ apps/spensive/lib/Spensive/View/Reports.pm	Tue Nov 20 12:09:54 2007
@@ -1,29 +1,19 @@
 package Spensive::View::Reports;
 use strict;
 use warnings;
-
 use Jifty::View::Declare -base;
-use Jifty::View::Declare::CRUD;
-
-import_templates Jifty::View::Declare::CRUD under '/';
+use base 'Jifty::View::Declare::CRUD';
 
 sub fragment_base_path {'/reports'}
-
 sub object_type { 'ExpenseReport' }
 
 
-template 'index.html' => page {
-    title is  'Reports' ;
-    form {  
-            render_region(
-                name     => 'reportlist',
-                path     => 'reports/list');
-    }
-
+private template view_item_controls => sub {
+    my $self =shift;
+    my $item=shift;
+    tangent(url => '/report/'.$item->id."/build", label => 'Manage expenses');
 };
 
-
-
 sub display_columns {
     my $self = shift;
     return ('title','description');