development tgext.admin now works with ToscaWidgets2

TurboGears · Mar 25, 2012 · fe6c5cf · fe6c5cf
1 parent 0801c85
commit fe6c5cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/devtools/templates/turbogears/+package+/controllers/root.py_tmpl b/devtools/templates/turbogears/+package+/controllers/root.py_tmpl
@@ -14,14 +14,12 @@ from {{package}}.controllers.secure import SecureController
 from {{package}}.model import DBSession, metadata
 {{endif}}
 
-{{if tw1 == 'True'}}
-    {{if auth == "sqlalchemy"}}
+{{if auth == "sqlalchemy"}}
 from tgext.admin.tgadminconfig import TGAdminConfig
 from tgext.admin.controller import AdminController
-    {{elif auth == "ming"}}
+{{elif auth == "ming"}}
 from tgext.admin.mongo import TGMongoAdminConfig
 from tgext.admin.controller import AdminController
-    {{endif}}
 {{endif}}
 
 from {{package}}.lib.base import BaseController
@@ -48,12 +46,10 @@ class RootController(BaseController):
     secc = SecureController()
 {{endif}}
 
-{{if tw1 == 'True'}}
-    {{if auth == "sqlalchemy"}}
+{{if auth == "sqlalchemy"}}
     admin = AdminController(model, DBSession, config_type=TGAdminConfig)
-    {{elif auth == "ming"}}
+{{elif auth == "ming"}}
     admin = AdminController(model, None, config_type=TGMongoAdminConfig)
-    {{endif}}
 {{endif}}
 
     error = ErrorController()

diff --git a/devtools/templates/turbogears/setup.py_tmpl b/devtools/templates/turbogears/setup.py_tmpl
@@ -44,13 +44,13 @@ install_requires=[
     "repoze.what >= 1.0.8",
     "repoze.who-friendlyform >= 1.0.4",
     "repoze.who==1.0.19",
+    "tgext.admin >= 0.3.11",
     {{endif}}
     {{if auth == "sqlalchemy"}}
     "repoze.who.plugins.sa",
     "repoze.what.plugins.sql>=1.0.1",
     {{endif}}
     {{if tw1 == 'True'}}
-    "tgext.admin >= 0.3.11",
     "tw.forms",
     {{else}}
     "tw2.forms",