Author: chrisz
Date: Sat Jan 26 06:35:47 2008
New Revision: 4050
URL: http://trac.turbogears.org/changeset/4050
Log:
Bringing bigstart controller code back into line (merging r3840 from 1.0 to 1.1
branch).
Modified:
branches/1.1/turbogears/qstemplates/quickstart/+package+/controllers.py_tmpl
branches/1.1/turbogears/qstemplates/quickstartbig/+package+/controllers/root.py_tmpl
Modified:
branches/1.1/turbogears/qstemplates/quickstart/+package+/controllers.py_tmpl
==============================================================================
---
branches/1.1/turbogears/qstemplates/quickstart/+package+/controllers.py_tmpl
(original)
+++
branches/1.1/turbogears/qstemplates/quickstart/+package+/controllers.py_tmpl
Sat Jan 26 06:35:47 2008
@@ -1,12 +1,12 @@
from turbogears import controllers, expose, flash
-# from model import *
+# from ${package} import model
#if $sqlobject == 'True'
import pkg_resources
try:
pkg_resources.require("$sqlobjectversion")
except pkg_resources.DistributionNotFound:
import sys
- print >> sys.stderr, """You are required to install SQLObject but appear
not to have done so.
+ print >> sys.stderr, """You are required to install SQLObject but appear
not to have done so.
Please run your projects setup.py or run `easy_install SQLObject`.
"""
@@ -18,7 +18,7 @@
pkg_resources.require("$sqlalchemyversion")
except pkg_resources.DistributionNotFound:
import sys
- print >> sys.stderr, """You are required to install SQLAlchemy but appear
not to have done so.
+ print >> sys.stderr, """You are required to install SQLAlchemy but appear
not to have done so.
Please run your projects setup.py or run `easy_install SQLAlchemy`.
"""
@@ -64,7 +64,7 @@
else:
msg=_("Please log in.")
forward_url= request.headers.get("Referer", "/")
-
+
response.status=403
return dict(message=msg, previous_url=previous_url, logging_in=True,
original_parameters=request.params,
Modified:
branches/1.1/turbogears/qstemplates/quickstartbig/+package+/controllers/root.py_tmpl
==============================================================================
---
branches/1.1/turbogears/qstemplates/quickstartbig/+package+/controllers/root.py_tmpl
(original)
+++
branches/1.1/turbogears/qstemplates/quickstartbig/+package+/controllers/root.py_tmpl
Sat Jan 26 06:35:47 2008
@@ -1,9 +1,33 @@
-from turbogears import controllers, expose
+from turbogears import controllers, expose, flash
# from ${package} import model
+#if $sqlobject == 'True'
+import pkg_resources
+try:
+ pkg_resources.require("$sqlobjectversion")
+except pkg_resources.DistributionNotFound:
+ import sys
+ print >> sys.stderr, """You are required to install SQLObject but appear
not to have done so.
+Please run your projects setup.py or run `easy_install SQLObject`.
+
+"""
+ sys.exit(1)
+#end if
+#if $sqlalchemy == 'True'
+import pkg_resources
+try:
+ pkg_resources.require("$sqlalchemyversion")
+except pkg_resources.DistributionNotFound:
+ import sys
+ print >> sys.stderr, """You are required to install SQLAlchemy but appear
not to have done so.
+Please run your projects setup.py or run `easy_install SQLAlchemy`.
+
+"""
+ sys.exit(1)
+#end if
#if $identity != "none"
from turbogears import identity, redirect
from cherrypy import request, response
-from ${package} import json
+# from ${package} import json
#end if
# import logging
# log = logging.getLogger("${package}.controllers")
@@ -16,6 +40,7 @@
def index(self):
import time
# log.debug("Happy TurboGears Controller Responding For Duty")
+ flash("Your application is now running")
return dict(now=time.ctime())
#if $identity != "none"
@@ -39,7 +64,7 @@
else:
msg=_("Please log in.")
forward_url= request.headers.get("Referer", "/")
-
+
response.status=403
return dict(message=msg, previous_url=previous_url, logging_in=True,
original_parameters=request.params,
