otree 6.0.7__tar.gz → 6.0.9__tar.gz

{otree-6.0.7/otree.egg-info → otree-6.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otree
-Version: 6.0.7
+Version: 6.0.9
 Summary: Framework for multiplayer strategy games and complex surveys.
 Home-page: http://otree.org/
 Author: chris@otree.org

{otree-6.0.7 → otree-6.0.9}/otree/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '6.0.7'
+__version__ = '6.0.9'
 # don't import anything else here because setup.py imports this.

{otree-6.0.7 → otree-6.0.9}/otree/export.py

@@ -111,9 +111,9 @@ def _get_table_fields(Model, custom_fields=None, for_export=False):
     specs = [
         ('player', BasePlayer, ['id_in_group', 'role', 'payoff']),
         # group.id_in_subsession is in DATA_TAB_FIXED_COLUMNS, not here
-        ('group', BaseGroup, []),
+        ('group', BaseGroup, ['id_in_subsession'] if for_export else []),
         # don't need round_number because it's already in the SessionData navigation toolbar
-        ('subsession', BaseSubsession, []),
+        ('subsession', BaseSubsession, ['round_number'] if for_export else []),
     ]
 
     for model_name_lower, BaseModel, built_in_fields in specs:

{otree-6.0.7 → otree-6.0.9}/otree/templates/otree/Page.html

@@ -10,8 +10,15 @@ i removed many linebreaks to make output HTML cleaner
 {% block body_main %}
     {% if is_defined('view.is_debug') and view.is_debug %}
     <script>
-    window.addEventListener('error', function() { window._hasJsErrors = true; });
-    window.addEventListener('unhandledrejection', function() { window._hasJsErrors = true; });
+    // Shows alert if it exists (for errors after debug_info loads).
+    // Also sets flag which debug_info checks (for errors before it loads).
+    function _showJsErrorAlert() {
+        window._hasJsErrors = true;
+        var el = document.getElementById('_js-errors-alert');
+        if (el) el.style.display = 'block';
+    }
+    window.addEventListener('error', _showJsErrorAlert);
+    window.addEventListener('unhandledrejection', _showJsErrorAlert);
     </script>
     {% endif %}
     {% if is_defined('js_vars') and js_vars %}<script>var js_vars = {{ js_vars }};</script>{% endif %}

{otree-6.0.7 → otree-6.0.9/otree.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otree
-Version: 6.0.7
+Version: 6.0.9
 Summary: Framework for multiplayer strategy games and complex surveys.
 Home-page: http://otree.org/
 Author: chris@otree.org