[Jifty-commit] r2744 - in jifty: . branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/model

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Wed Jan 31 11:42:56 EST 2007


Author: sterling
Date: Wed Jan 31 11:42:56 2007
New Revision: 2744

Added:
   jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/update
Modified:
   jifty/   (props changed)
   jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/list
   jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/new
   jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/view
   jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/model/list
   jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/model/view

Log:
 r2758 at riddle:  andrew | 2007-01-31 10:33:28 -0600
 Added a link to the admin record editor, fixed the columns pager, added the column update form, updated the column new form, and fixed column creation.


Modified: jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/list
==============================================================================
--- jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/list	(original)
+++ jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/list	Wed Jan 31 11:42:56 2007
@@ -63,8 +63,12 @@
 <%perl>
 if ($new_slot && !$collapsed) {
     Jifty->web->region(
-        name => 'new-model-column',
-        path => '/__jifty/builder/model/fragments/column/new');
+        name     => 'new-model-column',
+        path     => '/__jifty/builder/model/fragments/column/new',
+        defaults => {
+            model_class => $model_class,
+        },
+    );
 }
 </%perl>
 
@@ -78,4 +82,9 @@
 <%init>
 my $model_columns = Jifty::Model::ModelClassColumnCollection->new;
 $model_columns->limit( column => 'model_class', value => $model_class );
+
+$model_columns->set_page_info(
+    current_page => $page,
+    per_page     => $per_page,
+);
 </%init>

Modified: jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/new
==============================================================================
--- jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/new	(original)
+++ jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/new	Wed Jan 31 11:42:56 2007
@@ -3,6 +3,8 @@
 
 %# XXX Should these be broken into collapsible sections?
 <div class="jifty_admin create item">
+<% $create->hidden( model_class => $model_class ) %>
+
 <% $create->form_field('name') %>
 <% $create->form_field('label') %>
 <% $create->form_field('storage_type') %>
@@ -37,6 +39,7 @@
 ) %>
 
 <%args>
+$model_class
 $region
 </%args>
 <%init>

Added: jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/update
==============================================================================
--- (empty file)
+++ jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/update	Wed Jan 31 11:42:56 2007
@@ -0,0 +1,57 @@
+<div class="jifty_admin update item ModelClass">
+<div class="editlink">
+<% Jifty->web->link(
+    label   => _('Save'),
+    onclick => [
+        { submit => $update },
+        {
+            replace_with => '/__jifty/builder/model/fragments/model/view',
+            args         => { id => $id },
+        },
+    ],
+) %>
+<% Jifty->web->link(
+    label     => _('Cancel'),
+    onlick    => {
+        replace_with => '/__jifty/builder/model/fragments/model/view',
+        args         => { id => $id },
+    },
+    as_button => 1,
+) %>
+</div>
+
+<% $update->hidden( model_class => $model_class ) %>
+
+%# XXX See ./new for comments on field order.
+
+<% $update->form_field('name') %>
+<% $update->form_field('label') %>
+<% $update->form_field('storage_type') %>
+<% $update->form_field('default_value') %>
+<% $update->form_field('mandatory') %>
+<% $update->form_field('distinct_value') %>
+<% $update->form_field('hints') %>
+<% $update->form_field('description') %>
+
+<% $update->form_field('max_length') %>
+<% $update->form_field('render_as') %>
+<% $update->form_field('readable') %>
+<% $update->form_field('writable') %>
+<% $update->form_field('indexed') %>
+
+%# TODO Add teh rest of the fields.
+</div>
+
+<%args>
+$id
+</%args>
+<%init>
+my $model_column = Jifty::Model::ModelClass->new;
+$model_column->load($id);
+
+my $update = Jifty->web->new_action(
+    class   => 'Jifty::Action::UpdateModelClassColumn',
+    moniker => 'update-model-column-' . Jifty->web->serial,
+    record  => $model_column,
+);
+</%init>

Modified: jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/view
==============================================================================
--- jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/view	(original)
+++ jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/view	Wed Jan 31 11:42:56 2007
@@ -19,6 +19,7 @@
 
 <% $delete->hidden( id => $id ) %>
 
+<% $update->form_value('name') %>
 <% $update->form_value('label') %>
 <% $update->form_value('storage_type') %>
 <hr/>

Modified: jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/model/list
==============================================================================
--- jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/model/list	(original)
+++ jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/model/list	Wed Jan 31 11:42:56 2007
@@ -4,9 +4,9 @@
 
 <div class="list">
 % if ($model_classes->pager->total_entries == 0) {
-    <% _('No items found') %>
+    <% _('No models found') %>
 % } else {
-    <% _('%1 entries', $model_classes->count) %>
+    <% _('%1 models', $model_classes->count) %>
 % }
 
 <%perl>

Modified: jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/model/view
==============================================================================
--- jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/model/view	(original)
+++ jifty/branches/virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/model/view	Wed Jan 31 11:42:56 2007
@@ -1,19 +1,26 @@
 <div class="jifty_admin read item ModelClass">
 <% Jifty->web->form->submit(
-        class   => 'editlink',
-        label   => _('Delete'),
-        onclick => [
-            { confirm => _('Confirm delete?') },
-            { submit  => $delete },
-            { delete  => Jifty->web->current_region->qualified_name },
-        ]) %>
+    class   => 'editlink',
+    label   => _('Delete'),
+    onclick => [
+        { confirm => _('Confirm delete?') },
+        { submit  => $delete },
+        { delete  => Jifty->web->current_region->qualified_name },
+    ],
+) %>
 <% Jifty->web->link(
-        class   => 'editlink',
-        label   => _('Edit'),
-        onclick => {
-            replace_with => '/__jifty/builder/model/fragments/model/update',
-            args         => { id => $id },
-        }) %>
+    class   => 'editlink',
+    label   => _('Edit'),
+    onclick => {
+        replace_with => '/__jifty/builder/model/fragments/model/update',
+        args         => { id => $id },
+    },
+) %>
+<% Jifty->web->link(
+    class   => 'editlink',
+    label   => _('Records'),
+    url     => '/__jifty/admin/model/' . $model_class->name,
+) %>
 
 <% $delete->hidden( id => $id ) %>
 


More information about the Jifty-commit mailing list