[Rt-commit] r10046 - in rt/branches/3.999-DANGEROUS: etc lib/RT
lib/RT/Model
jesse at bestpractical.com
jesse at bestpractical.com
Sun Dec 23 13:37:26 EST 2007
Author: jesse
Date: Sun Dec 23 13:37:26 2007
New Revision: 10046
Modified:
rt/branches/3.999-DANGEROUS/ (props changed)
rt/branches/3.999-DANGEROUS/Makefile
rt/branches/3.999-DANGEROUS/etc/initialdata
rt/branches/3.999-DANGEROUS/lib/RT/CurrentUser.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm
rt/branches/3.999-DANGEROUS/lib/RT/Record.pm
Log:
r74076 at pinglin: jesse | 2007-12-23 13:35:34 -0500
* Jifty login plugin now lets users log in
Modified: rt/branches/3.999-DANGEROUS/Makefile
==============================================================================
--- rt/branches/3.999-DANGEROUS/Makefile (original)
+++ rt/branches/3.999-DANGEROUS/Makefile Sun Dec 23 13:37:26 2007
@@ -51,7 +51,7 @@
#
-PERL = /opt/local/bin/perl
+PERL = perl
CONFIG_FILE_PATH = /home/jesse/svk/3.999-DANGEROUS/etc
CONFIG_FILE = $(CONFIG_FILE_PATH)/RT_Config.pm
Modified: rt/branches/3.999-DANGEROUS/etc/initialdata
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/initialdata (original)
+++ rt/branches/3.999-DANGEROUS/etc/initialdata Sun Dec 23 13:37:26 2007
@@ -12,6 +12,7 @@
real_name => 'Enoch Root',
password => 'password',
email => "root\@localhost",
+ email_confirmed => 1,
comments => 'SuperUser',
privileged => '1', } );
Modified: rt/branches/3.999-DANGEROUS/lib/RT/CurrentUser.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/CurrentUser.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/CurrentUser.pm Sun Dec 23 13:37:26 2007
@@ -260,6 +260,12 @@
$self->user_object->has_right(@_);
}
+
+sub superuser {
+ my $self = shift;
+ return RT->system_user;
+}
+
sub name { shift->user_object->name }
sub principal_object { shift->user_object->principal_object }
1;
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm Sun Dec 23 13:37:26 2007
@@ -34,39 +34,66 @@
sub table {'Users'}
use Jifty::DBI::Record schema {
- column name => max_length is 200, type is 'varchar(200)', default is '';
- column comments => type is 'blob', default is '';
- column Signature => type is 'blob', default is '';
- column email => max_length is 120, type is 'varchar(120)', default is '';
- column freeform_contact_info => type is 'blob', default is '';
- column organization =>, max_length is 200, type is 'varchar(200)', default is '';
- column real_name => max_length is 120, type is 'varchar(120)', default is '';
- column nickname => max_length is 16, type is 'varchar(16)', default is '';
- column lang => max_length is 16, type is 'varchar(16)', default is '';
- column email_encoding => max_length is 16, type is 'varchar(16)', default is '';
- column web_encoding => max_length is 16, type is 'varchar(16)', default is '';
- column ExternalContactInfoId => max_length is 100, type is 'varchar(100)', default is '';
- column ContactInfoSystem => max_length is 30, type is 'varchar(30)', default is '';
- column ExternalAuthId => max_length is 100, type is 'varchar(100)', default is '';
- column auth_system => max_length is 30, type is 'varchar(30)', default is '';
- column Gecos => max_length is 16, type is 'varchar(16)', default is '';
- column HomePhone => max_length is 30, type is 'varchar(30)', default is '';
- column WorkPhone => max_length is 30, type is 'varchar(30)', default is '';
- column MobilePhone => max_length is 30, type is 'varchar(30)', default is '';
- column PagerPhone => max_length is 30, type is 'varchar(30)', default is '';
- column Address1 => max_length is 200, type is 'varchar(200)', default is '';
- column Address2 => max_length is 200, type is 'varchar(200)', default is '';
- column City => max_length is 100, type is 'varchar(100)', default is '';
- column State => max_length is 100, type is 'varchar(100)', default is '';
- column Zip => max_length is 16, type is 'varchar(16)', default is '';
- column Country => max_length is 50, type is 'varchar(50)', default is '';
- column Timezone => max_length is 50, type is 'varchar(50)', default is '';
- column PGPKey => type is 'text';
+ column comments => type is 'blob', default is '';
+ column Signature => type is 'blob', default is '';
+ column email => max_length is 120, type is 'varchar(120)', default is '';
+ column freeform_contact_info => type is 'blob', default is '';
+ column
+ organization =>,
+ max_length is 200, type is 'varchar(200)', default is '';
+ column
+ real_name => max_length is 120,
+ type is 'varchar(120)', default is '';
+ column nickname => max_length is 16, type is 'varchar(16)', default is '';
+ column lang => max_length is 16, type is 'varchar(16)', default is '';
+ column
+ email_encoding => max_length is 16,
+ type is 'varchar(16)', default is '';
+ column
+ web_encoding => max_length is 16,
+ type is 'varchar(16)', default is '';
+ column
+ ExternalContactInfoId => max_length is 100,
+ type is 'varchar(100)', default is '';
+ column
+ ContactInfoSystem => max_length is 30,
+ type is 'varchar(30)', default is '';
+ column
+ ExternalAuthId => max_length is 100,
+ type is 'varchar(100)', default is '';
+ column
+ auth_system => max_length is 30,
+ type is 'varchar(30)', default is '';
+ column Gecos => max_length is 16, type is 'varchar(16)', default is '';
+ column
+ HomePhone => max_length is 30,
+ type is 'varchar(30)', default is '';
+ column
+ WorkPhone => max_length is 30,
+ type is 'varchar(30)', default is '';
+ column
+ MobilePhone => max_length is 30,
+ type is 'varchar(30)', default is '';
+ column
+ PagerPhone => max_length is 30,
+ type is 'varchar(30)', default is '';
+ column
+ Address1 => max_length is 200,
+ type is 'varchar(200)', default is '';
+ column
+ Address2 => max_length is 200,
+ type is 'varchar(200)', default is '';
+ column City => max_length is 100, type is 'varchar(100)', default is '';
+ column State => max_length is 100, type is 'varchar(100)', default is '';
+ column Zip => max_length is 16, type is 'varchar(16)', default is '';
+ column Country => max_length is 50, type is 'varchar(50)', default is '';
+ column Timezone => max_length is 50, type is 'varchar(50)', default is '';
+ column PGPKey => type is 'text';
};
-
- use Jifty::Plugin::User::Mixin::Model::User; # name, email, email_confirmed
- use Jifty::Plugin::Authentication::Password::Mixin::Model::User;
+
+use Jifty::Plugin::User::Mixin::Model::User; # name, email, email_confirmed
+use Jifty::Plugin::Authentication::Password::Mixin::Model::User;
@@ -658,7 +685,7 @@
=cut
-sub set_password {
+sub before_set_password {
my $self = shift;
my $password = shift;
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Record.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Record.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Record.pm Sun Dec 23 13:37:26 2007
@@ -601,26 +601,6 @@
-sub __value {
- my $self = shift;
- my $field = shift;
- my %args = ( decode_utf8 => 1, @_ );
-
- unless ( $field ) {
- Carp::cluck;
- $RT::Logger->error("__value called with undef field");
- }
-
- my $value = $self->SUPER::__value( $field );
- if( $args{'decode_utf8'} ) {
- return Encode::decode_utf8( $value ) unless Encode::is_utf8( $value );
- } else {
- return Encode::encode_utf8( $value ) if Encode::is_utf8( $value );
- }
- return $value;
-}
-
-
=head2 _EncodeLOB BODY MIME_TYPE
Takes a potentially large attachment. Returns (ContentEncoding, EncodedBody) based on system configuration and selected database
More information about the Rt-commit
mailing list