Merge commit '8971cff64e' into datasource_fieldtypes

Fixing settings

Lodel/settings_format.py

@@ -13,6 +13,7 @@ MANDATORY = [
     'datasource',
     'mh_classname',
     'migration_options',
+    'base_path'
 ]
 
 ## @brief List allowed (but not mandatory) configurations keys

Template/Loader.py

@@ -21,7 +21,9 @@ class TemplateLoader(object):
     # @param template_file str : path to the template file (starting from the base path used to instanciate the
     #                            TemplateLoader)
     # @param template_vars dict : parameters to be used in the template
-    # @param template_extra list : list of custom modules to import in the template (default value : None)
+    # @param template_extra list : list of tuples indicating the custom modules to import in the template (default: None).
+    #                              The modules are given as tuples with the format : ('name_to_use_in_the_template', module)
+    #
     # @return str. String containing the HTML output of the processed templated
     def render_to_html(self, template_file, template_vars={}, template_extra=None):
         loader = jinja2.FileSystemLoader(searchpath=self.search_path, followlinks=self.follow_links)

install/Makefile

@@ -1,4 +1,4 @@
-all: refreshdyn dbinit
+all: refreshdyn dbinit dirinit
 
 refreshdyn: distclean
 	python -c "import utils; utils.refreshdyn()"
@@ -6,6 +6,9 @@ refreshdyn: distclean
 dbinit:
 	python -c "import utils; utils.db_init()"
 
+dirinit:
+	@mkdir templates
+
 emgraph:
 	python -c "import utils; utils.em_graph()"