John Chilton
6d727ce454
Merge stable.
2014-09-02 16:41:48 -04:00
Aysam Guerler
7dfb30354e
ToolForm: Add sliders, radio buttons for boolean and integer fields, Ui: Update frames
2014-09-02 16:06:35 -04:00
Carl Eberhard
cabe8ed425
History API: remove set_as_current, api/histories/current, and POST api/histories with current == True (create new current history), replace with controllers/history/set_as_current, current_history_json, and create_new_current (respectively) - all returning json; add exceptions.DeprecatedMethod; pack scripts
2014-09-02 13:26:47 -04:00
John Chilton
9978e26dce
Pack scripts.
2014-09-02 11:21:08 -04:00
John Chilton
24e914f57b
Fix workflow editor bug related state updates for collections attached to multiple input data parameters.
...
Detail bug report from Michael Crusoe here : https://trello.com/c/0mdGCx4P .
This also fixes a test case added in 289e48b which was both attempting to assert something wrong and was incorrectly implemented. Augmenting the workflow editor test suite with some actually valid test cases that assert the correct behaviors.
For a longer explaination - workflow input terminals have two related concepts 'canAccept' and 'attachable'. An output terminal is 'attachable' if in the abstract it could be attached to the input regardless of whether the input is already filled or not. 'canAccept' is more stateful in that an output terminal is 'canAccept'able if the input terminal is not filled ('_inputFilled') and it is 'attachable'.
So - the problem was 'attachable' was not correctly defined for a multiple input data parameters. 'attachable' was asserting that any connected input terminal could not be 'attachable' by an collection output terminal - so on these asynchronous node state changes collections attached to multiple input data parameters were being wiped out. The more percise/correct distinction is that if a multiple input data parameter has single inputs connected to it - it cannot also have a collection connected to it (yet anyway). This fixes the mentioned bug.
The problematic test case was conflating 'attachable' and 'canAccept'able - I have fixed the test case to verify the correct 'attachable' logic and added newer, higher level test cases to test the canAccept logic and the actual behavior the end user would observe (of the connector being destroy).
2014-09-02 11:20:44 -04:00
Dannon Baker
fd53ed075d
Pack scripts.
2014-09-02 09:29:50 -04:00
John Chilton
e8b7272aa8
Merge latest stable changes.
2014-09-02 08:54:56 -04:00
Jeremy Goecks
0c75a102d0
HDA/LDDA models: synchronize them with 'data_type' and 'file_ext', properly fill data_type with Galaxy data types, and use file_ext in place of data_type throughput client code.
2014-08-29 17:17:44 -04:00
Carl Eberhard
b8b1c4e36f
History contents: allow copying accessible datasets into this history
2014-08-29 10:43:51 -04:00
John Chilton
b78d059f4c
Pack scripts.
2014-08-29 00:31:59 -04:00
John Chilton
d80d1b1a8f
Fix for at workflow editor glitch.
2014-08-29 00:30:30 -04:00
Carl Eberhard
8b1af7ece5
Fix to history: remove prev. loading indicator before showing another
2014-08-28 16:51:28 -04:00
Aysam Guerler
34e146b33d
ToolForm: Adds limits for repeat blocks and fixes
2014-08-28 16:35:59 -04:00
Aysam Guerler
5980c1e467
ToolForm: Enables hierarchical references and conversion of the tool form into a json/xml tree structure
2014-08-28 14:03:35 -04:00
Carl Eberhard
17a6595b5c
Fix: remove 'jquery.event.drag.js' from base_panels.mako; Paired collection creator: allow single/multiple pairs to be re-ordered by drag and drop
2014-08-28 12:19:16 -04:00
Carl Eberhard
fb5a6afa97
UI, Paired collection creator: fixes and refactoring, allow pairs to be selected
2014-08-27 14:47:54 -04:00
Carl Eberhard
0baf3bfee3
UI, Paired collection creator: refactoring of paired HTML and fixes to draggable partition, add brush selection to unpaired
2014-08-26 16:30:46 -04:00
Carl Eberhard
da5513f038
(add packed scripts)
2014-08-26 12:59:59 -04:00
Carl Eberhard
8a9b24dcd4
UI, Dataset choice control: add DatasetChoiceModal for choosing single or multiple datasets, add DatasetChoice and MultiDatasetChoice for displaying and activating selection modal from within a page; correct lookup of galaxy_config in dataset-model; add ListPanel for displaying collections of ListViews; add DatasetListPanel for displaying collections of generic datasets; add default no-op localizer (_l) to ui.js until that file is AMD; factor out icon-btn.less from history.less; remove make_popup_menus in default expandable behaviors
2014-08-26 12:59:15 -04:00
John Chilton
62f0d9da61
Merge latest stable.
2014-08-25 15:35:45 -04:00
Aysam Guerler
6173935263
ToolForm: Add repeat blocks, refactor conditionals, fix styles, pack scripts
2014-08-25 12:27:18 -04:00
Aysam Guerler
707f180cdc
ToolForm: Implements conditionals
2014-08-22 14:32:07 -04:00
Dannon Baker
0da37adb13
Strip trailing whitespace from galaxy.menu.js
2014-08-20 12:56:01 -04:00
Dannon Baker
930fe2fa61
Swap remote user logout to actually follow galaxy internal logout procedure and then redirect. Also fix logic for user dropdown -- it was preventing users from seeing stuff that was actually available before.
2014-08-20 12:55:32 -04:00
Aysam Guerler
d995301098
ToolForm: Add data selector, dynamic column selector and checkboxes, extends json content for basic parameters
2014-08-19 15:01:57 -04:00
Dannon Baker
09f2a6967d
Update to jquery1.11.1. This resolves at least one issue related to submit listeners not being attached in iframes, causing tool form failures for tools using conditional parameters like single/paired end reads, default/advanced parameter sets, and so on.
2014-08-19 12:47:34 -04:00
Dannon Baker
ec8d5dfec0
Merged in martenson/galaxy-central-marten (pull request #451 )
...
UI + API for library, folder, library dataset and dataset permissions
2014-08-19 11:55:40 -04:00
Carl Eberhard
d3b51aea39
UI, History: add copy method to model; fill out history collection; pack scripts
2014-08-15 09:58:15 -04:00
Jeremy Goecks
2e9b7623f0
Code cleanup: semicolons and identity rather than equality.
2014-08-14 17:14:46 -04:00
Jeremy Goecks
fd5c19bf9f
Readd data module that is needed to display dataset contents in Scratchbook.
2014-08-14 17:04:06 -04:00
Jeremy Goecks
6872db6649
Remove unused code from client-side visualization library.
2014-08-14 16:41:37 -04:00
Carl Eberhard
346ff61251
Fix to 3179b324e9d5: remove debugging statements
2014-08-14 14:19:33 -04:00
Carl Eberhard
66faed9670
(pack scripts)
2014-08-14 14:16:34 -04:00
Carl Eberhard
43425d0b0a
Paired collection creator: add option to remove file extensions from pair names (note: will not change any manually changed names)
2014-08-14 14:16:07 -04:00
Carl Eberhard
e488d64629
Fix to 83c74e7d67f5: open regex tutorial in new tab
2014-08-14 12:21:11 -04:00
Carl Eberhard
45d1883700
Paired collection creator: use regex string matching for dataset filtering (by default - we'll see if that's the right choice), extract ajax error handler
2014-08-14 12:17:28 -04:00
Aysam Guerler
5a3741ab3c
Use floating instead of float as member id, pack code
2014-08-14 11:21:37 -04:00
Carl Eberhard
ca4e8ade92
QA, history panel: better error details: full url, ajax data, Raven/Sentry id if available; galaxy-app-base: add global listeners
2014-08-14 10:57:41 -04:00
Jeremy Goecks
80de8c1226
Trackster: fix display of overlapping reads by correctly resolving read length regardless of data loading/tile drawing order. Unfortunately, the easiest way to accomplish this required refactoring, hence the large commit. Pack scripts.
2014-08-13 17:25:35 -04:00
Aysam Guerler
1799e4d5ee
Add tool form basics, refactor ui libraries, add alternative tool form template
2014-08-13 13:53:07 -04:00
Carl Eberhard
cee979bff6
Paired collection creator: better notifications, style tweaks
2014-08-13 13:43:09 -04:00
John Chilton
d698c25f6e
Merge latest stable.
2014-08-13 11:14:34 -04:00
Carl Eberhard
2354033521
Fix to 264657d: make infomessage and persistent across states; Style tweaks
2014-08-13 10:03:29 -04:00
Martin Cech
aab4d9ba91
Merge
2014-08-12 17:40:09 -04:00
Martin Cech
7fb7c25efe
library tweaks, help buttons, refactoring,
2014-08-12 17:39:36 -04:00
Carl Eberhard
5ec0562d53
Datset list item: add resubmitted message; pack scripts
2014-08-12 13:56:26 -04:00
Carl Eberhard
39aa86e36d
QA, casperjs: fix selectors changed in 7005608
2014-08-12 11:42:03 -04:00
Carl Eberhard
205c1ce638
History panel: clean up and documentation
2014-08-12 10:45:26 -04:00
Carl Eberhard
2d4e2a7523
History & collections: client-side file and class renaming: - li: readonly list item view, - li-edit: editable list item view, - primary identity first (eg. hda-*), - moved hda/hdca into history directory; Fix bug for dataset URLs
2014-08-12 09:38:08 -04:00
Martin Cech
3e8b4df81f
Merge
2014-08-11 14:38:22 -04:00
John Chilton