Changeset 2958
- Timestamp:
- 02/23/07 22:53:35 (2 years ago)
- Files:
-
- sandbox/mscott/SchevoPylonsNav/trunk/schevopylonsnav/config/routing.py (modified) (1 diff)
- sandbox/mscott/SchevoPylonsNav/trunk/schevopylonsnav/controllers/extent_t_methods.py (modified) (1 diff)
- sandbox/mscott/SchevoPylonsNav/trunk/schevopylonsnav/controllers/transactions.py (modified) (3 diffs)
- sandbox/mscott/SchevoPylonsNav/trunk/schevopylonsnav/templates/transactions/edit.html (modified) (1 diff)
- sandbox/mscott/SchevoPylonsNav/trunk/schevopylonsnav/templates/transactions/show.html (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
sandbox/mscott/SchevoPylonsNav/trunk/schevopylonsnav/config/routing.py
r2956 r2958 21 21 map.resource('database', 'databases') 22 22 23 map.resource('query', 'queries') 23 map.resource('query', 'queries', 24 path_prefix='/databases/:db_id', 25 ) 24 26 25 27 map.resource('transaction', 'transactions', 28 path_prefix='/databases/:db_id', 26 29 member=dict(execute='POST'), 27 30 ) sandbox/mscott/SchevoPylonsNav/trunk/schevopylonsnav/controllers/extent_t_methods.py
r2954 r2958 26 26 token = g.new_cache_token(tx_cache) 27 27 tx_cache[token] = tx 28 return redirect_to(h.url_for('transaction', id=token))28 return redirect_to(h.url_for('transaction', db_id=db_id, id=token)) 29 29 30 30 def create(self): sandbox/mscott/SchevoPylonsNav/trunk/schevopylonsnav/controllers/transactions.py
r2953 r2958 23 23 pass 24 24 25 def update(self, id):25 def update(self, db_id, id): 26 26 """PUT /id: Update an existing item.""" 27 27 # Forms posted to this method should contain a hidden field: … … 36 36 value = postvars[field_name] 37 37 setattr(tx, field_name, value) 38 return redirect_to(h.url_for('transaction', id=id))38 return redirect_to(h.url_for('transaction', db_id=db_id, id=id)) 39 39 40 40 def delete(self, id): … … 47 47 pass 48 48 49 def show(self, id, format='html'):49 def show(self, db_id, id, format='html'): 50 50 """GET /id: Show a specific item.""" 51 51 # url_for('transaction', id=ID) 52 c.db_id = db_id 52 53 c.tx = g.tx_cache[id] 53 54 c.tx_id = id 54 55 return render_response('/transactions/show.html') 55 56 56 def edit(self, id, format='html'):57 def edit(self, db_id, id, format='html'): 57 58 """GET /id;edit: Form to edit an existing item.""" 58 59 # url_for('edit_transaction', id=ID) 60 c.db_id = db_id 59 61 c.tx = g.tx_cache[id] 60 62 c.tx_id = id 61 63 return render_response('/transactions/edit.html') 62 64 63 def execute(self, id):65 def execute(self, db_id, id): 64 66 """POST /id;execute: Execute a transaction.""" 65 67 # url_for('execute_transaction', id=ID) sandbox/mscott/SchevoPylonsNav/trunk/schevopylonsnav/templates/transactions/edit.html
r2952 r2958 10 10 <ul> 11 11 <li>Transactions</li> 12 <li><a href="${h.url_for('transaction', id=c.tx_id)}">${h.label(c.tx)}</a></li>13 <li class="here"><a href="${h.url_for('edit_transaction', id=c.tx_id)}">Edit</a></li>12 <li><a href="${h.url_for('transaction', db_id=c.db_id, id=c.tx_id)}">${h.label(c.tx)}</a></li> 13 <li class="here"><a href="${h.url_for('edit_transaction', db_id=c.db_id, id=c.tx_id)}">Edit</a></li> 14 14 </ul> 15 15 </%def> 16 16 17 17 <%def name="fields()"> 18 <form method="post" action="${h.url_for('transaction', id=c.tx_id)}">18 <form method="post" action="${h.url_for('transaction', db_id=c.db_id, id=c.tx_id)}"> 19 19 <input type="hidden" name="_method" value="PUT" /> 20 20 sandbox/mscott/SchevoPylonsNav/trunk/schevopylonsnav/templates/transactions/show.html
r2953 r2958 10 10 <ul> 11 11 <li>Transactions</li> 12 <li class="here"><a href="${h.url_for('transaction', id=c.tx_id)}">${h.label(c.tx)}</a></li>12 <li class="here"><a href="${h.url_for('transaction', db_id=c.db_id, id=c.tx_id)}">${h.label(c.tx)}</a></li> 13 13 </ul> 14 14 </%def> … … 30 30 31 31 <%def name="actions()"> 32 <form method="get" action="${h.url_for('edit_transaction', id=c.tx_id)}">32 <form method="get" action="${h.url_for('edit_transaction', db_id=c.db_id, id=c.tx_id)}"> 33 33 <input type="submit" value="Edit" /> 34 34 </form> 35 35 36 <form method="post" action="${h.url_for('execute_transaction', id=c.tx_id)}">36 <form method="post" action="${h.url_for('execute_transaction', db_id=c.db_id, id=c.tx_id)}"> 37 37 <input type="submit" value="Execute" /> 38 38 </form>
