Merge branch 'master' of github.com:nursix/eden

Conflicts:
	private/eden_deploy

VERSION

@@ -1 +1 @@
-DRKCM-1.5.6 (2020-01-02 20:01:50)
+DRKCM-1.5.6-1-ge2b93de (2020-02-08 16:02:39)

controllers/dc.py

@@ -36,7 +36,7 @@ def prep(r):
             query = (rtable.template_id == r.id) & \
                     (rtable.deleted == False)
             if db(query).select(rtable.id,
-                                limitby=(0, 1)
+                                limitby = (0, 1)
                                 ):
                 s3db.configure("dc_question",
                                deletable = False,
@@ -56,8 +56,12 @@ def prep(r):
 
             # Open in native controller to access Translations tabs
             s3db.configure("dc_question",
-                           linkto = lambda record_id: URL(f="question", args=[record_id, "read"]),
-                           linkto_update = lambda record_id: URL(f="question", args=[record_id, "update"]),
+                           linkto = lambda record_id: \
+                                        URL(f="question",
+                                            args=[record_id, "read"]),
+                           linkto_update = lambda record_id: \
+                                            URL(f="question",
+                                                args=[record_id, "update"]),
                            )
 
         return True
@@ -105,8 +109,12 @@ def prep(r):
 
                 # Open in native controller (cannot just set native as can't call this 'response')
                 s3db.configure("dc_response",
-                               linkto = lambda record_id: URL(f="respnse", args=[record_id, "read"]),
-                               linkto_update = lambda record_id: URL(f="respnse", args=[record_id, "update"]),
+                               linkto = lambda record_id: \
+                                            URL(f="respnse",
+                                                args=[record_id, "read"]),
+                               linkto_update = lambda record_id: \
+                                                        URL(f="respnse",
+                                                            args=[record_id, "update"]),
                                )
 
         return True
@@ -133,7 +141,7 @@ def respnse(): # Cannot call this 'response' or it will clobber the global
                 (rtable.template_id == ttable.id) & \
                 (ttable.table_id == dtable.id)
         template = db(query).select(dtable.name,
-                                    limitby=(0, 1),
+                                    limitby = (0, 1),
                                     ).first()
         try:
             dtablename = template.name