Changeset 2523
- Timestamp:
- 07/24/07 15:54:46 (1 year ago)
- Files:
-
- manualtestingplugin/manualtesting/DBUtils.py (modified) (1 diff)
- manualtestingplugin/manualtesting/htdocs/templates/suite.cs (modified) (3 diffs)
- manualtestingplugin/manualtesting/htdocs/templates/suites.cs (modified) (1 diff)
- manualtestingplugin/manualtesting/ManualTestingAPI.py (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
manualtestingplugin/manualtesting/DBUtils.py
r2520 r2523 41 41 rows.append(row) 42 42 return rows 43 44 def add_plan(self,cursor,suite_id,new_user,new_title,new_priority,new_description,new_time): 45 sql = "INSERT INTO mtp_plans (suite_id,cDate,mDate,title,priority,description,user) VALUES (%s,%s,%s,'%s','%s','%s','%s')" % (suite_id,1,1,new_title,new_priority,new_description,new_user) 46 self.log.debug(sql) 47 # ToDo: values in SQL statement must be escaped. 48 cursor.execute(sql) manualtestingplugin/manualtesting/htdocs/templates/suite.cs
r2521 r2523 14 14 </div> 15 15 16 <div id="content" class=" suites">16 <div id="content" class="listing suite"> 17 17 <h1>{<?cs var:manualtesting.suite.id ?>} <?cs var:manualtesting.suite.title ?></h1> 18 18 <p> … … 72 72 <tr class="odd"> 73 73 <?cs /if ?> 74 <td> 75 <strong>Description</strong> 76 </td> 77 <td colspan="2"> 74 <td colspan="3"> 75 <strong>Description:</strong><br /> 78 76 <?cs var:row.description ?> 79 77 </td> … … 87 85 <?cs /if ?> 88 86 <div class="buttons"> 89 <form action="" method="get"> 90 <div> 91 <input type="submit" value="Create new Test Plan" /> 92 <input type="hidden" name="action" value="new" /> 93 </div> 87 <form method="post" action="<?cs var:manualtesting.href ?>/<?cs var:manualtesting.suite.id ?>"> 88 <input type="submit" name="addplan" value="Add Test Plan" /> 89 <input type="hidden" name="suite_id" value="<?cs var:manualtesting.suite.id ?>" /> 90 <input type="hidden" name="manualtesting_action" value="add" /> 94 91 </form> 95 92 </div> manualtestingplugin/manualtesting/htdocs/templates/suites.cs
r2517 r2523 61 61 <?cs /if ?> 62 62 <div class="buttons"> 63 <form action="" method="get"> 64 <div> 65 <input type="submit" value="Create new Test Suite" /> 66 <input type="hidden" name="action" value="new" /> 67 </div> 63 <form method="post" action="<?cs var:manualtesting.href ?>"> 64 <input type="submit" name="addsuite" value="Add Test Suite" /> 65 <input type="hidden" name="manualtesting_action" value="add" /> 68 66 </form> 69 67 </div> manualtestingplugin/manualtesting/ManualTestingAPI.py
r2520 r2523 39 39 # Get action 40 40 component = req.args.get('component') 41 action = req.args.get(' discussion_action')41 action = req.args.get('manualtesting_action') 42 42 preview = req.args.has_key('preview'); 43 43 submit = req.args.has_key('submit'); … … 50 50 req.hdf['discussion.href'] = req.href(req.path_info) 51 51 else: 52 req.hdf['manualtesting.href'] = req.href. manualtesting()52 req.hdf['manualtesting.href'] = req.href.testing() 53 53 54 54 req.hdf['discussion.component'] = component … … 58 58 pass 59 59 elif suite_id: 60 return ['suite-view'] 60 if action == 'add': 61 return ['plan-add-form'] 62 elif action == 'plan-add': 63 return ['plan-add-submit', 'suite-view'] 64 elif action == 'delete': 65 return ['suite-delete', 'suite-view'] 66 else: 67 return ['suite-view'] 61 68 else: 62 69 return ['main'] … … 71 78 return 'suites.cs' 72 79 80 elif mode == 'plan-add-form': 81 suite = self.dbUtils.get_suite(cursor, suite_id) 82 req.hdf['manualtesting.suite'] = suite 83 # Get form values. 84 new_title = req.args.get('title') 85 new_description = req.args.get('description') 86 new_priority = req.args.get('priority') 87 # Display pupulated form (if data is available) 88 if new_title: 89 req.hdf['manualtesting.title'] = wiki_to_oneliner(new_title, self.env) 90 if new_priority: 91 req.hdf['manualtesting.priority'] = wiki_to_oneliner(new_priority, self.env) 92 if new_description: 93 req.hdf['manualtesting.description'] = wiki_to_html(new_description, self.env, req) 94 # Return template 95 return 'plan-add.cs' 96 97 elif mode == 'plan-add-submit': 98 # Get form values. 99 new_user = req.args.get('user') 100 new_title = req.args.get('title') 101 new_priority = req.args.get('priority') 102 new_description = req.args.get('description') 103 new_time = int( time.time() ) 104 # Add plan. 105 self.log.debug(new_description) 106 self.dbUtils.add_plan(cursor,suite_id,new_user,new_title,new_priority,new_description,new_time) 107 73 108 elif mode == 'suite-view': 74 109 # Display the plans in a suite.
