Browse Source

restore tg2 admin module + associated route (note: still bugs, waiting for a reply on tg mailing list)

Damien Accorsi 10 years ago
parent
commit
665e54b4eb
2 changed files with 26 additions and 23 deletions
  1. 16 10
      bin/setup.sh
  2. 10 13
      pboard/pboard/controllers/root.py

+ 16 - 10
bin/setup.sh View File

@@ -45,25 +45,31 @@ echo
45 45
 echo
46 46
 echo
47 47
 echo "-------------------------"
48
-echo "- setup project"
49
-echo "-------------------------"
50
-cd pboard/
51
-python setup.py develop
52
-echo
53
-echo
54
-
55
-echo
56
-echo
57
-echo "-------------------------"
58 48
 echo "- install dependencies"
59 49
 echo "-------------------------"
60 50
 echo "-> psycopg2"
61 51
 echo "-> pillow"
52
+echo "-> beautifulsoup4"
53
+echo "-> tw.forms"
54
+echo "-> tgext.admin"
62 55
 pip install psycopg2
63 56
 pip install pillow
64 57
 pip install beautifulsoup4
58
+pip install tw.forms
59
+pip install tgext.admin
60
+echo
61
+echo
65 62
 
66 63
 echo
67 64
 echo
65
+echo "-------------------------"
66
+echo "- setup project"
67
+echo "-------------------------"
68
+cd pboard/
69
+python setup.py develop
70
+echo
71
+echo
72
+
73
+
68 74
 
69 75
 cd ${OLD_PATH}

+ 10 - 13
pboard/pboard/controllers/root.py View File

@@ -1,23 +1,18 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 """Main Controller"""
3
+import pboard
3 4
 
4 5
 import tg
5 6
 from tg import expose, flash, require, url, lurl, request, redirect, tmpl_context
6 7
 from tg.i18n import ugettext as _, lazy_ugettext as l_
7 8
 from tg import predicates
8
-from pboard import model
9
-from pboard.model import DBSession, metadata
10
-# FIXME - D.A. - 2013-11-19
11
-# python3 port is not yet available for the tgext.admin module
12
-#
13
-# from tgext.admin.tgadminconfig import TGAdminConfig
14
-# from tgext.admin.controller import AdminController
9
+
10
+import tgext.admin.tgadminconfig as tgat
11
+import tgext.admin.controller as tgac
15 12
 
16 13
 from pboard.lib.base import BaseController
17 14
 from pboard.controllers.error import ErrorController
18 15
 
19
-import pboard.model as pbm
20
-import pboard.controllers as pbc
21 16
 from pboard.lib import dbapi as pld
22 17
 from pboard.controllers import api as pbca
23 18
 from pboard.controllers import debug as pbcd
@@ -43,10 +38,12 @@ class RootController(BaseController):
43 38
     must be wrapped around with :class:`tg.controllers.WSGIAppController`.
44 39
 
45 40
     """
46
-    # FIXME - D.A. - 2013-11-19
47
-    # python3 port is not yet available for the tgext.admin module
48
-    #
49
-    # admin = AdminController(model, DBSession, config_type=TGAdminConfig)
41
+
42
+    admin = tgac.AdminController(
43
+        pm,
44
+        pm.DBSession,
45
+        config_type = tgat.TGAdminConfig
46
+    )
50 47
 
51 48
     api   = pbca.PODApiController()
52 49
     debug = pbcd.DebugController()