[Jifty-commit] r3002 - in jifty/branches/virtual-models: .

[jifty-commit at lists.jifty.org]

Author: sterling
Date: Fri Mar 16 16:13:35 2007
New Revision: 3002

Modified:
   jifty/branches/virtual-models/   (props changed)
   jifty/branches/virtual-models/lib/Jifty/Model/ModelClass.pm
   jifty/branches/virtual-models/lib/Jifty/Model/ModelClassColumn.pm

Log:
 r3244 at riddle:  andrew | 2007-03-16 15:13:23 -0500
 Moved super_classes to the front of @ISA and added implementations for current_user_can on models and column.


Modified: jifty/branches/virtual-models/lib/Jifty/Model/ModelClass.pm
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/Model/ModelClass.pm	(original)
+++ jifty/branches/virtual-models/lib/Jifty/Model/ModelClass.pm	Fri Mar 16 16:13:35 2007
@@ -159,12 +159,13 @@
     my $uuid = $self->__uuid;
     my $base_class = Jifty->config->framework('ApplicationClass') . "::Record";
     my $super_classes 
-        = defined $self->super_classes ? ' '.$self->super_classes : '';
+        = defined $self->super_classes ? $self->super_classes.' ' : '';
+
     my $class                 = << "EOF";
 use warnings;
 use strict;
 package $fully_qualified_class;
-use base qw'$base_class$super_classes';
+use base qw'$super_classes$base_class';
 
 use constant CLASS_UUID => '$uuid';
 
@@ -213,4 +214,21 @@
     return $ret->return_value;
 }
 
+=head2 current_user_can 
+
+All users can read, but only superuser can write. This needs to be better thought out.
+
+=cut
+
+sub current_user_can {
+    my $self = shift;
+    my $right = shift;
+
+    if ($right eq 'read') {
+        return 1;
+    }
+
+    return $self->SUPER::current_user_can($right, @_);
+}
+
 1;

Modified: jifty/branches/virtual-models/lib/Jifty/Model/ModelClassColumn.pm
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/Model/ModelClassColumn.pm	(original)
+++ jifty/branches/virtual-models/lib/Jifty/Model/ModelClassColumn.pm	Fri Mar 16 16:13:35 2007
@@ -226,4 +226,21 @@
     return @widgets;
 }
 
+=head2 current_user_can 
+
+All users can read, but only superuser can write. This needs to be better thought out.
+
+=cut
+
+sub current_user_can {
+    my $self = shift;
+    my $right = shift;
+
+    if ($right eq 'read') {
+        return 1;
+    }
+
+    return $self->SUPER::current_user_can($right, @_);
+}
+
 1;