[Rt-commit] rt branch, admin_ui, updated. 49f5f078a4ee08c01c1c312cc5f93a3aa44ed46a

[sunnavy at bestpractical.com]

The branch, admin_ui has been updated
       via  49f5f078a4ee08c01c1c312cc5f93a3aa44ed46a (commit)
      from  c41aa478639c5cc38e38ca651de6658b1b8ea604 (commit)

Summary of changes:
 lib/RT/View/Admin/Queues/Templates.pm |   63 ++++++++++++++------------------
 1 files changed, 28 insertions(+), 35 deletions(-)

- Log -----------------------------------------------------------------
commit 49f5f078a4ee08c01c1c312cc5f93a3aa44ed46a
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Dec 11 10:22:51 2009 +0800

    improve Templates view

diff --git a/lib/RT/View/Admin/Queues/Templates.pm b/lib/RT/View/Admin/Queues/Templates.pm
index c8a0215..d7f5a9d 100644
--- a/lib/RT/View/Admin/Queues/Templates.pm
+++ b/lib/RT/View/Admin/Queues/Templates.pm
@@ -56,8 +56,8 @@ use constant page_title      => 'Queue Templates Management';
 use constant object_type     => 'Template';
 
 use constant display_columns => qw(id name description type);
-use constant edit_columns => qw(name description type content);
-use constant create_columns => qw(name description type content);
+use constant edit_columns => qw(name description type content queue);
+use constant create_columns => qw(name description type content queue);
 
 private template view_item_controls => sub {
     my $self   = shift;
@@ -82,41 +82,34 @@ sub _current_collection {
     return $collection;    
 }
 
-# overwrote this because we need to set queue info
-private template 'new_item_controls' => sub {
-    my $self          = shift;
-    my $create        = shift;
-    my ($object_type) = ( $self->object_type );
-
-    outs(
-        Jifty->web->form->submit(
-            label   => _('Create'),
-            onclick => [
-                {
-                    submit => {
-                        action    => $create,
-                        arguments => { queue => get('queue') }
-                    }
-                },
-                { refresh_self => 1 },
-                {
-                    delete =>
-                      Jifty->web->qualified_parent_region('no_items_found')
-                },
-                {
-                    element => Jifty->web->current_region->parent->get_element(
-                        'div.crud-list'),
-                    append => $self->fragment_for('view'),
-                    args   => {
-                        object_type => $object_type,
-                        id          => { result_of => $create, name => 'id' },
-                    },
-                },
-            ]
-        )
+sub create_field_queue {
+    my $self   = shift;
+    my %args   = @_;
+    my $action = $args{action};
+    render_param(
+        $action, 'queue',
+        render_as     => 'hidden',
+        default_value => get('queue'),
     );
-};
+}
+
+# overwrote this to set queue info
+private template 'new_item_region' => sub {
+    my $self                  = shift;
+    my $fragment_for_new_item = get('fragment_for_new_item')
+      || $self->fragment_for('new_item');
+    my $object_type = $self->object_type;
 
+    return unless $self->record_class->new->current_user_can('create');
+
+    if ($fragment_for_new_item) {
+        render_region(
+            name     => 'new_item',
+            path     => $fragment_for_new_item,
+            defaults => { object_type => $object_type, queue => get('queue') },
+        );
+    }
+};
 
 1;
 

-----------------------------------------------------------------------