Changeset 5038

Show
Ignore:
Timestamp:
07/24/08 23:27:37 (6 months ago)
Author:
percious
Message:

fixed tgcrud to support dbsprockets 0.5

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • projects/tg.devtools/trunk/devtools/templates/crud_controller.py_tmpl

    r4591 r5038  
    66 
    77#dbsprockets 
    8 from dbsprockets.primitives import makeForm, makeTable, getTableValue, makeRecordView 
     8from dbsprockets.primitives import make_form, make_table, get_table_value, make_record_view 
    99from dbsprockets.saprovider import SAProvider 
    1010from cStringIO import StringIO 
    …… 
    1414 
    1515def admin_links(viewConfig, row): 
    16     pks = viewConfig.metadata.primaryKeys() 
     16    pks = viewConfig.metadata.primary_keys() 
    1717    pkString = viewConfig._writePKsToURL(pks, row) 
    1818    links = StringIO() 
    …… 
    2828    return HTML(links.getvalue()) 
    2929 
    30 ${modelnameLower}_list = makeTable(${modelname}, '${modelnameLower}', makeLinks = admin_links) 
    31 recordView = makeRecordView(${modelname}) 
     30${modelnameLower}_list = make_table(${modelname}, '${modelnameLower}', make_links = admin_links) 
     31recordView = make_record_view(${modelname}) 
    3232#dbsprockets end 
    3333 
    …… 
    3636    modelname    = '${modelname}' 
    3737    tablename    = '${tablename}' 
    38      
     38 
    3939    @expose() 
    4040    def index(self): 
    …… 
    5050 
    5151        #dbsprockets 
    52         value = getTableValue(${modelname}) 
     52        value = get_table_value(${modelname}) 
    5353 
    54         pylons.c.w.table = ${modelnameLower}_list 
     54        pylons.c.table = ${modelnameLower}_list 
    5555        return dict(value=value, modelname=self.modelname) 
    5656 
    …… 
    6262 
    6363        #dbsprockets 
    64         pylons.c.w.widget = recordView 
    65         value = provider.selectOnPks(tableName=self.tablename,values=kw)[0] 
    66         return dict(value=value) 
     64        pylons.c.widget = recordView 
     65        value = provider.select_on_primary_keys(table_name=self.tablename,values=kw)[0] 
     66        return dict(value=value, modelname='{modelname}') 
    6767 
    6868    @expose("genshi:${package}.templates.${modelpackageLower}.new_form") 
    6969    def new(self, **kw): 
    7070        """Form to add new record""" 
    71         pylons.c.w.form = new_form 
     71        pylons.c.form = new_form 
    7272        return dict(modelname = self.modelname) 
    7373 
    …… 
    8787 
    8888        #dbsprockets 
    89         provider.add(tableName=self.tablename, values=kw) 
     89        provider.add(table_name=self.tablename, values=kw) 
    9090 
    9191        flash("${modelname} was successfully created.") 
    …… 
    9494    @expose("genshi:${package}.templates.${modelpackageLower}.edit_form") 
    9595    def edit(self, **kw): 
    96         pylons.c.w.form = edit_form 
     96        pylons.c.form = edit_form 
    9797 
    9898        #raw sqlalchemy 
    …… 
    102102        #    flash("Not valid edit") 
    103103        #    raise redirect("list") 
    104          
    105         #dbsprockets      
     104 
     105        #dbsprockets 
    106106        value = {} 
    107         pks = sorted(provider.getPrimaryKeys(self.tablename)) 
     107        pks = sorted(provider.get_primary_keys(self.tablename)) 
    108108        if pks == sorted(kw.keys()): 
    109             value = dict(provider.selectOnPks(self.tablename, values=kw)[0]) 
     109            value = dict(provider.select_on_primary_keys(self.tablename, values=kw)[0]) 
    110110        else: 
    111111            value.update(kw) 
    …… 
    124124 
    125125        #dbsprockets 
    126         provider.edit(tableName=self.tablename, values=kw) 
     126        provider.edit(table_name=self.tablename, values=kw) 
    127127 
    128128        flash("${modelname} was successfully updated.") 
    …… 
    138138 
    139139        #dbsprockets 
    140         provider.delete(tableName=self.tablename, values=kw) 
     140        provider.delete(table_name=self.tablename, values=kw) 
    141141 
    142142        flash("${modelname} was successfully destroyed.") 

  • projects/tg.devtools/trunk/devtools/templates/crud/edit_form.html_tmpl

    r4488 r5038  
    1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  
     1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
    22                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
    33<html xmlns="http://www.w3.org/1999/xhtml" 
    …… 
    1515 
    1616<h1>Editing $${modelname}</h1> 
    17 $${tmpl_context.w.form(value=value, action='update?${id}=%s'%value.${id}, submit_text = "Update")} 
     17$${tmpl_context.form(value=value, action='update?${id}=%s'%value.${id}, submit_text = "Update")} 
    1818<br/> 
    1919 

  • projects/tg.devtools/trunk/devtools/templates/crud_form_widget.py_tmpl

    r4494 r5038  
    1 # Use dbsprockets makeForm 
     1# Use dbsprockets make_form 
    22# http://code.google.com/p/dbsprockets/wiki/Primitives 
    33from ${package}.model import DBSession, ${modelname} 
    44 
    5 from dbsprockets.primitives import makeForm 
    6 new_form    = makeForm(${modelname}, action="create", omittedFields=['${id}']) 
    7 edit_form    = makeForm(${modelname}, action="update", hiddenFields=['${id}']) 
     5from dbsprockets.primitives import make_form 
     6new_form    = make_form(${modelname}, action="create", omitted_fields=['${id}']) 
     7edit_form    = make_form(${modelname}, action="update", hidden_fields=['${id}']) 
    88 
    99# Use Widget Form 

  • projects/tg.devtools/trunk/devtools/templates/crud/list.html_tmpl

    r4488 r5038  
    1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  
     1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
    22                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
    33<html xmlns="http://www.w3.org/1999/xhtml" 
    …… 
    1414<body> 
    1515    <h1>Listing $${modelname}</h1> 
    16     $${tmpl_context.w.table(value)} 
     16    $${tmpl_context.table(value)} 
    1717<!--    <table> 
    18      
     18 
    1919    <tr> 
    2020        <th> title </th> 
    …… 
    2929        <td><a href="$${tg.url('edit?${id}=%s'%record.${id})}">Edit</a></td> 
    3030        <td><a href="$${tg.url('destroy?${id}=%s'%record.${id})}" onclick="if (confirm('Are you sure?')) { var f = document.createElement('form');this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href; f.submit(); };return false;">Destroy</a></td> 
    31     </tr>  
     31    </tr> 
    3232    </table> 
    3333--> 

  • projects/tg.devtools/trunk/devtools/templates/crud/new_form.html_tmpl

    r4488 r5038  
    1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  
     1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
    22                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
    33<html xmlns="http://www.w3.org/1999/xhtml" 
    …… 
    1414<body> 
    1515    <h1>New $${modelname}</h1> 
    16     $${tmpl_context.w.form(submit_text = "Create")} 
     16    $${tmpl_context.form(submit_text = "Create")} 
    1717</body> 
    1818</html> 

  • projects/tg.devtools/trunk/devtools/templates/crud/show.html_tmpl

    r4488 r5038  
    1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  
     1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
    22                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
    33<html xmlns="http://www.w3.org/1999/xhtml" 
    …… 
    1313 
    1414<body> 
    15     $${tmpl_context.w.widget(value)} 
     15    $${tmpl_context.widget(value)} 
    1616    <br/> 
    1717    <a href="$${tg.url('edit?${id}=%s'%value.${id})}">Edit</a> | <a href="$${tg.url('list')}">Back</a> 

  • projects/tg.devtools/trunk/setup.py

    r4878 r5038  
    1818    include_package_data=True, 
    1919    zip_safe=False, 
    20     install_requires=['Pylons>=0.9.7beta5','TurboGears2>=1.9.7a1',  
    21         'SQLAlchemy>=0.5beta1', 'PEAK-Rules', 
     20    install_requires=['Pylons>=0.9.7beta5','TurboGears2',  
     21        'SQLAlchemy', 'PEAK-Rules', 
    2222        'sqlalchemy-migrate>=0.4.4', 'ToscaWidgets>=0.9',  
    2323        'tw.forms>=0.9', 'DBSprockets >=0.5dev-r380',