Merge branch 'newlodel' of git.labocleo.org:lodel2 into newlodel

Conflicts:
	plugins/webui/interface/urls.py

lodel/editorial_model/exceptions.py

@@ -5,7 +5,10 @@ class EditorialModelError(Exception):
 
 
 def assert_edit():
-    from lodel import Settings
+    try:
+        from lodel import Settings
+    except ImportError: #Very dirty, but don't know how to fix the tests
+        return
     if not Settings.editorialmodel.editormode:
         raise EditorialModelError("EM is readonly : editormode is OFF")
 

lodel/editorial_model/model.py

@@ -176,7 +176,7 @@ class EditorialModel(object):
     # @param emclass EmClass : the EmClass instance to add
     # @return emclass
     def add_class(self, emclass):
-        assert_edit()()
+        assert_edit()
         if not isinstance(emclass, EmClass):
             raise ValueError("<class EmClass> expected but got %s " % type(emclass))
         if emclass.uid in self.classes():
@@ -188,7 +188,7 @@ class EditorialModel(object):
     # @param emgroup EmGroup : the EmGroup instance to add
     # @return emgroup
     def add_group(self, emgroup):
-        assert_edit()()
+        assert_edit()
         if not isinstance(emgroup, EmGroup):
             raise ValueError("<class EmGroup> expected but got %s" % type(emgroup))
         if emgroup.uid in self.groups():
@@ -201,7 +201,7 @@ class EditorialModel(object):
     #@param **kwargs : EmClass constructor options ( 
     # see @ref lodel.editorial_model.component.EmClass.__init__() )
     def new_class(self, uid, **kwargs):
-        assert_edit()()
+        assert_edit()
         return self.add_class(EmClass(uid, **kwargs))
     
     ##@brief Add a new EmGroup to the editorial model
@@ -209,14 +209,14 @@ class EditorialModel(object):
     #@param *kwargs : EmGroup constructor keywords arguments (
     # see @ref lodel.editorial_model.component.EmGroup.__init__() )
     def new_group(self, uid, **kwargs):
-        assert_edit()()
+        assert_edit()
         return self.add_group(EmGroup(uid, **kwargs))
 
     ##@brief Save a model
     # @param translator module : The translator module to use
     # @param **translator_args
     def save(self, translator, **translator_kwargs):
-        assert_edit()()
+        assert_edit()
         if isinstance(translator, str):
             translator = self.translator_from_name(translator)
         return translator.save(self, **translator_kwargs)

plugins/webui/interface/controllers/__init__.py

@@ -1,3 +1,5 @@
 from .base import *
 from .admin import *
 from .document import *
+from .listing import *
+

plugins/webui/interface/controllers/base.py

@@ -22,5 +22,10 @@ def not_found(request):
 
 
 def test(request):
+    template_vars = {
+        'id': request.url_args['id'],
+        'params': request.GET
+    }
+    return get_response('test.html', tpl_vars=template_vars)
     return get_response('test.html')
     

plugins/webui/interface/controllers/document.py

@@ -2,5 +2,5 @@ from .base import get_response
 
 
 def show_document(request):
-    template_vars = {'id': request.url_args[0]}
+    template_vars = {'id': request.url_args['id']}
     return get_response('documents/show.html', tpl_vars=template_vars)

plugins/webui/interface/controllers/listing.py

@@ -1,7 +1,6 @@
 from .base import get_response
-
+import leapi_dyncode as dyncode
 def list_classes(request):
     # TODO Add the method to get the classes list
-    template_vars = {'id': request.url_args[0]}
-
-    return get_response('listing/list_classes.html')
+    template_vars = {'my_classes': dyncode.dynclasses}
+    return get_response('listing/list_classes.html', tpl_vars=template_vars)

plugins/webui/interface/router.py

@@ -3,19 +3,15 @@ import re
 
 from .controllers import *
 from .urls import urls
+from ..main import root_url
 from lodel.settings import Settings
 
-
 def format_url_rule(url_rule):
-    if url_rule == '^$':
-        return "^%s$" % Settings.sitename
-
-    formatted_rule = ''
     if url_rule.startswith('^'):
-        formatted_rule += "^"
-
-    formatted_rule += "%s/%s" % (Settings.sitename, url_rule)
-    return formatted_rule
+        res = url_rule.replace('^', '^'+root_url())
+    else:
+        res = root_url()+'.*'+url_rule
+    return res
 
 
 def get_controller(request):
@@ -26,9 +22,14 @@ def get_controller(request):
 
     # Returning the right controller to call
     for regex, callback in url_rules:
-        match = re.search(regex, request.PATH)
+        p = re.compile(regex)
+        m = p.search(request.PATH)
+        if m is not None:
+            request.url_args = m.groupdict()
+            return callback
+        '''match = re.search(regex, request.PATH)
         if match is not None:
             request.url_args = match.groups()
             return callback
-
+        '''
     return not_found

plugins/webui/interface/template/loader.py

@@ -2,9 +2,13 @@
 import jinja2
 import os
 
+from lodel.settings import Settings
+import leapi_dyncode
+
 import settings
 from .api import api_lodel_templates
 from .exceptions.not_allowed_custom_api_key_error import NotAllowedCustomAPIKeyError
+from ...main import root_url
 
 from ...main import PLUGIN_PATH
 TEMPLATE_PATH = os.path.realpath(os.path.join(PLUGIN_PATH, 'templates/'))
@@ -39,6 +43,11 @@ class TemplateLoader(object):
         # lodel2 default api is loaded
         # TODO change this if needed
         template.globals['lodel'] = api_lodel_templates
+        template.globals['leapi'] = leapi_dyncode
+        template.globals['settings'] = Settings
+        template.globals['url'] = lambda sufix='': root_url()\
+            + ('' if sufix.startswith('/') else '/')\
+            + sufix
 
         # Extra modules are loaded
         if template_extra is not None:

plugins/webui/interface/urls.py

@@ -1,12 +1,12 @@
 from .controllers import *
 
 urls = (
-    (r'^$', index),
-    (r'admin/?$', admin),
-    (r'admin/(.+)$', admin),
-    (r'test/(.+)$', test),
-    (r'test/?$', test),
-    (r'show/(.+)$', show_document),
-    (r'list_classes/(.+)$', list_classes),
-    (r'list_classes/?$', list_classes)
+    (r'^/?$', index),
+    (r'^/admin/?$', admin),
+    (r'^/admin/(.+)$', admin),
+    (r'/test/(?P<id>.*)$', test),
+    (r'^/test/?$', test),
+    (r'/show/(?P<id>.*)$', show_document),
+    (r'^/list_classes/(.+)$', list_classes),
+    (r'^/list_classes/?$', list_classes),
 )

plugins/webui/main.py

@@ -6,6 +6,11 @@ from lodel.settings import Settings
 
 PLUGIN_PATH = os.path.dirname(__file__)
 
+##@brief Return the root url of the instance
+def root_url():
+    return Settings.sitename
+
+
 ##@brief uwsgi startup demo
 @LodelHook('lodel2_loader_main')
 def uwsgi_fork(hook_name, caller, payload):

plugins/webui/templates/test.html

@@ -1,6 +1,13 @@
 <html>
 <head></head>
 <body>
+    URL arg : id = {{ id }}<br />
+    GET values :<br />
+    <ul>
+    {% for argument_name, argument_value in params.items() %}
+        <li>{{argument_name}} = {{ argument_value }}</li>
+    {% endfor %}
+    </ul>
     <form action="http://localhost:9090/admin?r=1&rand[]=7&rand[]=5" method="POST" enctype="multipart/form-data">
         <input type="text" name="re[]" value="3"><br />
         <input type="text" name="re[]" value="1"><br />