[Rt-commit] rt branch, admin_ui, updated. 93cfd7c437c634880e4cf92093028229f9a886bb
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Thu Nov 26 04:00:16 EST 2009
The branch, admin_ui has been updated
via 93cfd7c437c634880e4cf92093028229f9a886bb (commit)
via 160db9b9dbebc993b6da97397acc4da6119c0871 (commit)
from 1929c2c3b0c88442a9431fbad1d93026b8665359 (commit)
Summary of changes:
lib/RT/Shredder.pm | 14 ++--
lib/RT/Shredder/Plugin/SQLDump.pm | 8 +-
lib/RT/View/Admin/Queues.pm | 75 +------------------
.../{RT--Attachment => RT--Model--Attachment} | 0
.../Object/{RT--Ticket => RT--Model--Ticket} | 0
.../Elements/Object/{RT--User => RT--Model--User} | 0
share/html/Admin/Tools/Shredder/index.html | 4 +-
7 files changed, 17 insertions(+), 84 deletions(-)
rename share/html/Admin/Tools/Shredder/Elements/Object/{RT--Attachment => RT--Model--Attachment} (100%)
rename share/html/Admin/Tools/Shredder/Elements/Object/{RT--Ticket => RT--Model--Ticket} (100%)
rename share/html/Admin/Tools/Shredder/Elements/Object/{RT--User => RT--Model--User} (100%)
- Log -----------------------------------------------------------------
commit 160db9b9dbebc993b6da97397acc4da6119c0871
Author: sunnavy <sunnavy at bestpractical.com>
Date: Wed Nov 25 23:10:57 2009 +0800
revert b64585d69
diff --git a/lib/RT/View/Admin/Queues.pm b/lib/RT/View/Admin/Queues.pm
index 6c904a1..be7b6a4 100644
--- a/lib/RT/View/Admin/Queues.pm
+++ b/lib/RT/View/Admin/Queues.pm
@@ -50,78 +50,11 @@ use strict;
package RT::View::Admin::Queues;
use Jifty::View::Declare -base;
-#use base 'RT::View::CRUD';
+use base 'RT::View::CRUD';
-#use constant page_title => 'Queue Management';
-#use constant object_type => 'Queue';
-#use constant display_columns => qw(id name description correspond_address
-# comment_address initial_priority default_due_in);
-
-template 'index.html' =>
-page { title => _('Queues') }
-content {
- my $include_disable = get( 'find_disabled_queues' );
- if ( $include_disable ) {
- h1 { _('All Queues') };
- }
- else {
- h1 { _('Enabled Queues') };
- }
-
- my $queues = RT::Model::QueueCollection->new;
- $queues->find_all_rows;
- if ( $include_disable ) {
- $queues->{'find_disabled_rows'} = 1;
- }
-
- p { _("Select a queue") };
- unless ( $queues->count ) {
- em { _('No queues matching search criteria found.') };
- } else {
- my @fields = ( '#', qw/name description address priority default_due_in/ );
- push @fields, 'disabled' if $include_disable;
- table {
- thead { row {
- for my $head ( @fields ) {
- cell { { class is 'labeltop' }; $head };
- }
- } };
- tbody {
- while ( my $queue = $queues->next ) {
- row {
- for my $field ( @fields ) {
- cell { { class is 'value' };
- if ( $field eq '#' ) {
- $queue->id
- }
- elsif ( $field eq 'disabled' ) {
- $queue->disabled ? 'disabled' : 'enabled'
- }
- elsif ( $field eq 'address' ) {
- ( $queue->correspond_address ||'-'). '/' .
- ($queue->comment_address || '-')
- }
- elsif ( $field eq 'priority' ) {
- ( $queue->initial_priority || 0 ). '/' .
- ( $queue->final_priority || 0 )
- }
- else {
- $queue->$field
- }
- };
- }
- };
- }
- }
- };
- }
-
- hyperlink(
- label => _('Include disabled queues in listing.'),
- url => '/admin/queues',
- parameters => { find_disabled_queues => 1 },
- );
-};
+use constant page_title => 'Queue Management';
+use constant object_type => 'Queue';
+use constant display_columns => qw(id name description correspond_address initial_priority default_due_in);
1;
commit 93cfd7c437c634880e4cf92093028229f9a886bb
Author: sunnavy <sunnavy at bestpractical.com>
Date: Thu Nov 26 14:23:26 2009 +0800
case fixes
diff --git a/lib/RT/Shredder.pm b/lib/RT/Shredder.pm
index 142fa89..2bc846e 100644
--- a/lib/RT/Shredder.pm
+++ b/lib/RT/Shredder.pm
@@ -607,7 +607,7 @@ sub _wipeout {
=head3 Data storage and backups
-=head4 get_filename ( Filename => '<ISO DATETIME>-XXXX.sql', FromStorage => 1 )
+=head4 get_file_name ( Filename => '<ISO DATETIME>-XXXX.sql', FromStorage => 1 )
Takes desired C<Filename> and flag C<FromStorage> then translate file name to absolute
path by next rules:
@@ -640,26 +640,26 @@ Returns an absolute path of the file.
Examples:
# file from storage with default name format
- my $fname = $shredder->get_filename;
+ my $fname = $shredder->get_file_name;
# file from storage with custom name format
- my $fname = $shredder->get_filename( Filename => 'shredder-XXXX.backup' );
+ my $fname = $shredder->get_file_name( Filename => 'shredder-XXXX.backup' );
# file with path relative to the current dir
- my $fname = $shredder->get_filename(
+ my $fname = $shredder->get_file_name(
FromStorage => 0,
Filename => 'backups/shredder.sql',
);
# file with absolute path
- my $fname = $shredder->get_filename(
+ my $fname = $shredder->get_file_name(
FromStorage => 0,
Filename => '/var/backups/shredder-XXXX.sql'
);
=cut
-sub get_filename {
+sub get_file_name {
my $self = shift;
my %args = ( filename => '', from_storage => 1, @_ );
@@ -718,7 +718,7 @@ sub get_filename {
Returns an absolute path to the storage dir. See
L<CONFIGURATION/$ShredderStoragePath>.
-See also description of the L</get_filename> method.
+See also description of the L</get_file_name> method.
=cut
diff --git a/lib/RT/Shredder/Plugin/SQLDump.pm b/lib/RT/Shredder/Plugin/SQLDump.pm
index e1c5494..a0147c9 100644
--- a/lib/RT/Shredder/Plugin/SQLDump.pm
+++ b/lib/RT/Shredder/Plugin/SQLDump.pm
@@ -57,15 +57,15 @@ sub applies_to_states { return 'after wiping dependencies' }
sub support_args {
my $self = shift;
- return $self->SUPER::support_args, qw(filename from_storage);
+ return $self->SUPER::support_args, qw(file_name from_storage);
}
sub test_args {
my $self = shift;
my %args = @_;
$args{'from_storage'} = 1 unless defined $args{'from_storage'};
- my $file = $args{'filename'} = RT::Shredder->get_filename(
- filename => $args{'filename'},
+ my $file = $args{'file_name'} = RT::Shredder->get_file_name(
+ file_name => $args{'file_name'},
from_storage => delete $args{'from_storage'},
);
open $args{'file_handle'}, ">:raw", $file
@@ -74,7 +74,7 @@ sub test_args {
return $self->SUPER::test_args(%args);
}
-sub filename { return $_[0]->{'opt'}{'filename'} }
+sub file_name { return $_[0]->{'opt'}{'file_name'} }
sub file_handle { return $_[0]->{'opt'}{'file_handle'} }
sub run {
diff --git a/share/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment b/share/html/Admin/Tools/Shredder/Elements/Object/RT--Model--Attachment
similarity index 100%
rename from share/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment
rename to share/html/Admin/Tools/Shredder/Elements/Object/RT--Model--Attachment
diff --git a/share/html/Admin/Tools/Shredder/Elements/Object/RT--Ticket b/share/html/Admin/Tools/Shredder/Elements/Object/RT--Model--Ticket
similarity index 100%
rename from share/html/Admin/Tools/Shredder/Elements/Object/RT--Ticket
rename to share/html/Admin/Tools/Shredder/Elements/Object/RT--Model--Ticket
diff --git a/share/html/Admin/Tools/Shredder/Elements/Object/RT--User b/share/html/Admin/Tools/Shredder/Elements/Object/RT--Model--User
similarity index 100%
rename from share/html/Admin/Tools/Shredder/Elements/Object/RT--User
rename to share/html/Admin/Tools/Shredder/Elements/Object/RT--Model--User
diff --git a/share/html/Admin/Tools/Shredder/index.html b/share/html/Admin/Tools/Shredder/index.html
index a68b29a..22bab8b 100644
--- a/share/html/Admin/Tools/Shredder/index.html
+++ b/share/html/Admin/Tools/Shredder/index.html
@@ -69,7 +69,7 @@ $wipeout => ''
</div>
<br />
% if( $search || $wipeout ) {
-<& Elements/Selectobjects, objects => \@objs &>
+<& Elements/SelectObjects, objects => \@objs &>
% }
</form>
</&>
@@ -178,7 +178,7 @@ if( $plugin && ( $search || $wipeout ) ) { { # use additional block({}) to effec
my $shredder = new RT::Shredder;
foreach my $o( grep defined, splice @objs ) {
- eval { push @objs, $shredder->cast_objectsToRecords( objects => $o ) };
+ eval { push @objs, $shredder->cast_objects_to_records( objects => $o ) };
$catch_non_fatals->() && last if $@;
}
unless( @objs ) {
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list