Navigation

Changeset 5494

Timestamp:

09/27/08 23:13:56 (3 months ago)

Author:

carndt

Message:

Toolbox console handles failure to load model gracefully and displays error message, when first opened

Files:

r2470	r5494
17	17	<center>
18	18	<div id="main_content">
	19	<div py:if="defined('errors')" py:strip="True">
	20	<p py:for="error in errors" py:content="error" class="error" />
	21	</div>
19	22	<form id="interpreter_form" action="">
20	23	<div id="interpreter_area">
…	…
25	28	<br/>
26	29	<h3>Multiline (code-block) Input:</h3>
27		<textarea name="interpreter_block_text"
28		id="interpreter_block_text" style="width:610px;height:170px"
	30	<textarea name="interpreter_block_text"
	31	id="interpreter_block_text" style="width:610px;height:170px"
29	32	class="textbox"></textarea>
30	33	<br />

r5215	r5494
1		import turbogears
2		from turbogears import controllers, expose
	1	import logging
3	2	import sys
4	3	import StringIO
	4
	5	import turbogears
	6	import pkg_resources
	7	from turbogears import controllers, expose
5	8	from code import InteractiveConsole
	9
	10
	11	log = logging.getLogger('turbogears.toolbox')
6	12
7	13
…	…
72	78
73	79	def new_console(self):
	80	data = dict()
74	81	locs = dict(__name__='tg-admin', __doc__=None,
75	82	reload_console=self.new_console)
76		mod = turbogears.util.get_model()
77		if mod:
78		locs.update(mod.__dict__)
	83	try:
	84	mod = turbogears.util.get_model()
	85	if mod:
	86	locs.update(mod.__dict__)
	87	except (pkg_resources.DistributionNotFound, ImportError):
	88	import traceback
	89	error = "Error: could not load data model.\n"
	90	data['errors'] = [error]
	91	error += traceback.format_exc()
	92	log.warn(error)
79	93	self.console = InteractiveConsole(locals=locs)
	94	return data
80	95
81	96	@expose(template="kid:turbogears.toolbox.console")
82	97	def index(self):
	98	data = dict()
83	99	if not self.console:
84		~~self.new_console(~~)
85		return d~~ict()~~
	100	data.update(self.new_console())
	101	return data