Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 889ed2547a2b6a94a5a357792eb69349b63f8232 https://github.com/galaxyproject/galaxy/commit/889ed2547a2b6a94a5a357792eb69... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-05-12 (Thu, 12 May 2016) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-model.js M lib/galaxy/managers/hdas.py M static/maps/mvc/dataset/dataset-model.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/dataset/dataset-model.js M test/unit/managers/test_HDAManager.py Log Message: ----------- UI & API: fix display of inaccessible datasets - Uses contexts in serializers to restore inaccessible field of hdas - Overrides serialize to return only the inaccessible view of inaccessible hdas (no other keys are returned): 'accessible', 'id', 'name', 'history_id', 'hid', 'history_content_type', 'state', 'deleted', 'visible' - If a DatasetAssociation Backbone Model is inaccessible, considers it to have details preventing the (failing) GET for more details Should be revisited if/when thread local contexts (user/session) are working. Commit: d9c0f4fa4444747bfd08ec021102d5a2b66d3cd3 https://github.com/galaxyproject/galaxy/commit/d9c0f4fa4444747bfd08ec021102d... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-05-16 (Mon, 16 May 2016) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-model.js M lib/galaxy/managers/hdas.py M static/maps/mvc/dataset/dataset-model.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/dataset/dataset-model.js M test/unit/managers/test_HDAManager.py Log Message: ----------- Merge branch 'datasets.show-inaccessible' into dev Compare: https://github.com/galaxyproject/galaxy/compare/65c57c5d52bc...d9c0f4fa4444