Merge branch 'master' into 'production'

Release 0.7.3

See merge request !35

modules/plugin_event/dataframes.py

@@ -62,7 +62,7 @@ def active_period(**kwargs):
             stop (date): is fixed to DATE_MAX when not defined
 
     """
-    db = current.globalenv['db']
+    db = current.db
     history = db.history
 
     # extract database information
@@ -377,7 +377,7 @@ def get_items(**kwargs):
                 * one column for each key of the history.data dictionary
 
     """
-    db = current.globalenv['db']
+    db = current.db
     history = db.history
 
     # database query including foreign table
@@ -565,7 +565,7 @@ def get_items_small(**kwargs):
                 * one column for each key of the history.data dictionary
 
     """
-    db = current.globalenv['db']
+    db = current.db
     history = db.history
 
     # database query
@@ -715,7 +715,7 @@ def get_objectlike_items(**kwargs):
                 * one column for each key of the history.data dictionary
 
     """
-    db = current.globalenv['db']
+    db = current.db
     history = db.history
 
     # database query including foreign table
@@ -890,7 +890,7 @@ def get_peoplelike_items(**kwargs):
                 * one column for each key of the history.data dictionary
 
     """
-    db = current.globalenv['db']
+    db = current.db
     history = db.history
 
     # database query including foreign table

modules/plugin_event/model_report.py

@@ -7,7 +7,7 @@ import numpy as np
 
 from callbacks import ON_CREATE_LISTS2, ON_UPDATE_LISTS2
 from event import Event
-from gluon import current, IS_IN_SET
+from gluon import IS_IN_SET
 from pydal import Field
 
 
@@ -94,7 +94,7 @@ class Report(object):
             pyDAL.Table
 
         """
-        migrate = current.globalenv["MIGRATE"]
+        migrate = db._migrate or db._migrate_enabled
 
         table = db.define_table(
             "lists2",

modules/plugin_event/report_tools.py

@@ -140,7 +140,7 @@ class BaseReport(object):
 
         """
         T = current.T
-        db = current.globalenv["db"]
+        db = current.db
 
         config = self.config
         selector = self.selector
@@ -428,8 +428,8 @@ class List(BaseReport):
     """
     def __init__(self, id_list):
 
-        db = current.globalenv["db"]
-        virtdb = current.globalenv["virtdb"]
+        db = current.db
+        virtdb = current.virtdb
 
         BaseReport.__init__(
             self,
@@ -558,8 +558,8 @@ class Metric2D(BaseReport):
     """
     def __init__(self, id_report):
 
-        db = current.globalenv["db"]
-        virtdb = current.globalenv["virtdb"]
+        db = current.db
+        virtdb = current.virtdb
 
         BaseReport.__init__(
             self,
@@ -770,7 +770,7 @@ class Source(BaseReport):
     """
     def __init__(self, name):
 
-        virtdb = current.globalenv["virtdb"]
+        virtdb = current.virtdb
 
         BaseReport.__init__(
             self,

modules/plugin_event/ui_core.py

@@ -15,8 +15,9 @@ storeModifier = dbui.StoreModifier
 class CoreUi(object):
 
     @staticmethod
-    def define(db, T):
-        """Tune the user interface for the history table and its foreign tables,
+    def configure(db, T):
+        """Configure the user interface for the history table and
+        its foreign tables,
 
         Args:
             db (pyDAL.DAL): database connection

modules/plugin_event/ui_report.py

@@ -31,9 +31,9 @@ It is possible to filter the source by applying a query on its fields.
 class ReportUi(object):
 
     @staticmethod
-    def define(db, T):
-        """Tune the user interface for the report tables: lists, metrics1d,
-        metrics2d and graphs.
+    def configure(db, T):
+        """Configure the user interface for the report tables lists
+        and metrics2d.
 
         Args:
             db (pyDAL.DAL): database connection

modules/plugin_event/ui_selector.py

@@ -16,8 +16,8 @@ storeModifier = dbui.StoreModifier
 class SelectorUi(object):
 
     @staticmethod
-    def define(virtdb, db, T):
-        """Tune the user interface for the selector.
+    def configure(virtdb, db, T):
+        """Configure the user interface for selectors.
 
         Args:
             virtdb (pyDAL.DAL): connection to the virtual database

modules/plugin_event/ui_viewport.py

@@ -18,7 +18,7 @@ to_grid = dbui.to_gridPanel
 class ViewportUi(object):
 
     @staticmethod
-    def define(db, T, virtdb):
+    def configure(db, T, virtdb):
         """Configure the viewport.
 
         Args:

static/plugin_event/CHANGELOG

@@ -2,16 +2,16 @@
 
 HEAD
 
-0.7.2 (Apr 2017)
+0.7.3 (Apr 2017)
   - Major release which is non backward compatible.
     It introduces new mechanisms for the reporting based on pandas.DataFrame.
   - Required plugin_dbui 0.9.8 or higher.
-  - Add two tables Lists2 and Metrics2D2.
-  - Remove the tables Graphs, Lists, Metrics1D, Metrics2D.
+  - Add two database tables lists2 and metrics2d2.
+  - Remove the tables graphs, lists, metrics1d, metrics2d.
   - Remove the modules selector and report_objects.
-  - Add the modules dataframes, and report_tools.
-  - Improve the UI for the filtering of the history table, as well as
-    for the selector used by reports.
+  - Add the modules auth, dataframes, and report_tools.
+  - Improve the UI to the filter of the history table, as well as
+    selectors for reports.
   - Introduce the JavaScript widgets Summary and Graph.
   - Update the documentation.
 

static/plugin_event/VERSION

-0.7.2
+0.7.3
\ No newline at end of file