Dannon Baker
d76fb90e15
Merge next-stable.
2014-05-29 08:23:03 -04:00
Jeremy Goecks
df9ef1f107
Enhance TabularChunkedView to load first chunk from server if it's not already available. This enables TabularChunkedView to be loaded dynamically rather than relying on bootstrapped data.
2014-05-28 17:20:15 -04:00
Carl Eberhard
e82a1ad9af
HDA view: properly compile underscore template on first load, override template fn to pass localizer (_l) into template fn
2014-05-28 13:41:07 -04:00
John Chilton
a7b7519e3f
Remove invalid comment.
2014-05-28 11:58:33 -05:00
Dannon Baker
f610d230c3
Cleanup prior to tabular work.
2014-05-28 09:47:22 -04:00
Jeremy Goecks
2d5f057e39
Remove jStorage from Trackster requirements because it is not used.
2014-05-27 17:42:10 -04:00
John Chilton
f009c80d6d
Merge next-stable.
2014-05-27 12:53:20 -05:00
John Chilton
4db3430511
Pack scripts.
2014-05-27 12:53:06 -05:00
John Chilton
cda34115c5
Bugfix: Workflow editor would unnessecarily leave nodes in mapped over state when no connections force it.
...
Other small code harmonizations to do this cleanly.
2014-05-27 12:52:41 -05:00
John Chilton
b8de16eff2
Bugfix: Fix another attachable bug related to collections and multiple inputs (like 1882eff).
...
With unit tests that would have prevented both bugs.
2014-05-27 12:52:41 -05:00
John Chilton
23d2462f0a
Bugfix: Workflow editor mapping icon bug.
2014-05-27 12:52:41 -05:00
Aysam Guerler
3bdb0066b6
Ui: Refactoring of ui-tabs
2014-05-26 23:57:16 -04:00
John Chilton
fede9b8cee
Pack scripts.
2014-05-23 17:06:44 -05:00
John Chilton
30338b74b9
Bugfix: Wf editor didn't update params that change between data to data_collection.
2014-05-23 17:05:52 -05:00
John Chilton
3516d03a18
Bugfix: Workflow editor did not handle canAccept properly for multiple input reductions.
2014-05-23 16:50:36 -05:00
John Chilton
f8fa135605
Pack scripts.
2014-05-22 11:02:05 -05:00
John Chilton
d59a593212
Fix GUI for f24bb5d.
2014-05-22 11:01:04 -05:00
John Chilton
448e345119
Pack scripts.
2014-05-19 13:38:21 -05:00
John Chilton
121c481411
Don't show different multi-run option button if only one option.
2014-05-19 13:36:49 -05:00
Martin Cech
f599e9b01c
data libraries: permissions UI and API work, library router fixes, security addition for retrieving paginated roles for given dataset
2014-05-16 18:13:26 -04:00
Martin Cech
37d8aac8cd
data libraries: first take on api for requesting roles(assigned and assignable) for permissions; do not use - needs to be tested on test
...
changes to UI, removed modal for dataset details, dissasembled into separate backbone view
2014-05-14 13:53:01 -04:00
Martin Cech
4605eeb541
extended ui-select module to support multiple inputs and on-demand ajax loading of paginated data
2014-05-14 13:50:15 -04:00
Martin Cech
dd4170cf9e
important docs for select2 backbone view
2014-05-12 14:56:06 -04:00
Martin Cech
ab74f2d3f6
data libraries: introduced three visible share states for datasets in libraries private(only the current users private role has access)/restricted(not private and not non-restricted)/non-restricted(there is not a single role in the access set of roles)
...
also callback on modal hide() to call router and modify URL, some other minor fixes, pep8
2014-05-07 16:51:36 -04:00
Martin Cech
e0dd790f91
packed versions of John's JS code from dataset collections
2014-05-07 14:29:04 -04:00
Martin Cech
4ad5b570a1
allow JS modal to execute callbacks on hide()
2014-05-07 14:23:15 -04:00
John Chilton
1d88cb2cee
Merged in jmchilton/galaxy-central-fork-1 (pull request #379 )
...
Disable select2 for all multi-select inputs.
2014-05-06 10:08:39 -05:00
John Chilton
fa7d906333
Dataset collections - update workflow editor for collection inputs, mapping, and reduction.
...
This commit enables the workflow editor to deal with input collection data parameter types and inputs (easy) and much more complicatedly reason about mappings and reductions over inputs and collection inputs. Not sure I can really describe the new interface in a changeset - essentially it is more complicated to determine if a input can be connected to by an output - and that connection affects what are valid other inputs and what the outputs are.
2014-05-06 08:54:31 -05:00
John Chilton
437967959a
Add helper destroyInvalidConnections to Terminal.
...
Used in current workflow and reused in different context in collection code.
2014-05-06 08:54:31 -05:00
John Chilton
cbb5a33f93
Dataset collections - backbone view for history content.
2014-05-06 08:54:31 -05:00
John Chilton
beec8d981d
More reworking of backbone views to allow multiple content types.
2014-05-06 08:54:31 -05:00
John Chilton
e6e10e46d8
Dataset collections - backbone model for history content.
2014-05-06 08:54:31 -05:00
John Chilton
3b8bbd0aae
Dataset collections - create lists and pairs via HDA multi-select.
2014-05-06 08:54:31 -05:00
John Chilton
7d14e29091
Dataset collections - allow mapping collection params over subcollections.
2014-05-06 08:54:30 -05:00
John Chilton
5410d476e8
Dataset collections - "reduce" with existing tools.
...
Allow users to select dataset collections in place of individual datasets for data tool parameters with multiple="true" enabled (if all elements of collection would be valid as input to this parameter).
Restrict collection reductions to flat collections. If a user wanted to reduce a nested collection they probably want to map of the subcollections reducing each and building a collection of the reductions. TODO: The sentence is probably unintelligiable, need to provide a concrete example.
A functional test demonstrating these reductions in included.
2014-05-06 08:54:30 -05:00
John Chilton
74c645ba8c
Allow running tools on multiple datasets simulatenously (UI).
...
Update tool form. This commit needs work to ensure this only affects the tool_form.mako.
2014-05-06 08:54:30 -05:00
John Chilton
4394723ab5
Rename historyPanel.refershHdas to refreshContents.
2014-05-06 08:54:30 -05:00
John Chilton
e391dd3db5
Refactor backbone views to allow different kinds of history contents.
...
This makes room for a forth coming HistoryDatasetCollectionAssociation model that will be emitted from the history contents API. Same comment as previous changeset applies - this is a potentially crude way to share duplicated functionality and a better design would be most welcome.
2014-05-06 08:54:30 -05:00
John Chilton
16b5bb875f
Refactor backbone models to allow different kinds of history contents.
...
In particular, add a new backbone parent model (HistoryContent) refactored out of HistoryDatasetAssociation. This makes room for a forth coming HistoryDatasetCollectionAssociation model that will be emitted from the history contents API.
There are likely better ways to share common functionality between a dataset and a dataset collection contents - more JS savy developers should feel free to refactor into smaller mixins for instance. For now HistoryContent is just composed of the overlap in functionality between dataset and collection representations downstream and is an quick and dirty way to share said functionality.
2014-05-06 08:54:30 -05:00
Martin Cech
bba6048af9
data libraries: when importing into history set it as current and provide link to the 'Analyze page' so users can switch quickly
2014-05-05 13:51:13 -04:00
Carl Eberhard
d769895cc2
aad9eb1a8486: remove debugging statement
2014-05-05 13:36:51 -04:00
Carl Eberhard
3538c70bfc
Fixes: correct docs in histories/set_as_current to PUT; use correct empty msg when removing the last hda view in a history; remove dependency on utils.js from ui-modal.js
2014-05-05 13:34:07 -04:00
Martin Cech
fe79378599
data libraries: router improvements, detecting whether the loaded page is the first page of the app (user came from outside) or within and navigating accordingly
2014-05-05 13:03:16 -04:00
Martin Cech
033e67698b
data libraries: first take on shareable url for datasets
2014-05-02 18:00:23 -04:00
Carl Eberhard
6fbd061961
History: cruft removal from controller and associated javascript
2014-05-02 15:45:25 -04:00
Martin Cech
a1f6d2042e
data libraries: bugfix, better UI changes role handling (stilll not _good_ but better)
2014-05-01 18:21:37 -04:00
Carl Eberhard
c5ac90301e
History: remove unused server templates history_common, history_item, and history_annotation_table; Pages: remove unused dialog for annotated histories
2014-05-01 09:17:19 -04:00
Martin Cech
6ef129ed60
data libraries: streamlined deleting and undeleting datasets, filter to include deleted dataset on every folder, better errror handling, some refactoring
2014-04-30 16:38:56 -04:00
Martin Cech
89d424dae9
data libraries: new API for deleting LDAs, UI improvements, download router flow changes
2014-04-29 18:11:06 -04:00
Martin Cech
7b06f76cca
data lirbaries: support for showing deleted datasets in the folderview
2014-04-28 15:15:25 -04:00
Dannon Baker