Commit Graph
1453 Commits
Author SHA1 Message Date
Greg Von Kuster bfabec75a0 Fixes for column_maker and filtering tool to use new approach for handling metadata in the tool params - functional tests should now pass. 2008-07-23 17:12:01 -04:00
Greg Von Kuster 5dd014a91e Completed an old FIXME in DefaultToolAction.execute() - metadata no longer added to "incoming". Tool config params changed from things like$input_chromCol to ${input.metadata.chromCol}. 2008-07-23 15:27:39 -04:00
Greg Von Kuster 9dbf7c0385 Corrected some text in the compare tool config. 2008-07-23 09:35:34 -04:00
Greg Von Kuster 0ca286098f Add use_remote_user to the reports config. 2008-07-23 09:24:13 -04:00
Greg Von Kuster 872c0d6c94 Make sure dataset peek is set before trying to display it. 2008-07-22 12:27:26 -04:00
James Taylor b23200d5b8 Fix generation of links in tool_menu so that they point to the tool_runner
controller even when called as /root/tool_menu.
2008-07-22 11:02:41 -04:00
James Taylor 958770640d Fixes to tool parameter error handling in workflows. Workflows are now
ordered by update_time desc in index pages. The menu frame refreshes
properly on changing the workflow menu.
2008-07-21 21:15:10 -04:00
James Taylor 64aea7a907 Move "Run Workflow" button to bottom for consistency with other forms. 2008-07-21 20:48:06 -04:00
James Taylor 1033fcf211 Allow result of file upload (and other datasets that don't have job records)
to be used as "Input Datasets" when constructing a workflow from a history.
Fix problem with dynamic selects in histories (the values are now properly
wrapped with UnvalidatedValue).
2008-07-21 20:04:11 -04:00
James Taylor d2c5e99b9e Eager load HDAs. Must be careful with these joins, this was really slowing
down /history on test. Run with "echo=True" for a while after making
substantial database changes.
2008-07-21 19:59:42 -04:00
James Taylor e65294e0d5 Fix workflow menu configuration (submitting with not entries works,
orphaned entry rows are deleted). Also prevent users from sharing a workflow
with themselves.
2008-07-21 18:39:18 -04:00
Greg Von Kuster f8c00de9bc Fix for displaying peek columns if a column contains no data. 2008-07-21 10:51:46 -04:00
Daniel Blankenberg 2c38721060 Typo in last commit. 2008-07-18 12:11:58 -04:00
Daniel Blankenberg a19093d158 Fix bug in JobWrapper.get_input_fnames(), used by pbs runner, when an input dataset was optional and left empty. 2008-07-18 12:10:23 -04:00
James Taylor 70c4b8ee23 Workflows (owned and shared) can now be added to the tool menu. 2008-07-17 22:14:40 -04:00
James Taylor a46def3c5c Merge. 2008-07-17 20:42:00 -04:00
James Taylor d6607906d4 Allow loading a specific controller/action in the root middle frame, and use
this to allow the workflow editor to return to the workflow management page.
2008-07-17 20:40:20 -04:00
James Taylor a633e8cd25 Fix for scroll panel when dropping while still overlapping the edge. 2008-07-17 20:16:13 -04:00
James Taylor b1c4645b54 Some page titles 2008-07-17 19:46:28 -04:00
James Taylor 3fc7bb94ad Eagerload stored -> current workflow and workflow -> steps. 2008-07-17 19:45:56 -04:00
James Taylor 65bf65223f Handle target = "_parent" in popup menu so that workflow editor doesn't load
in the middle frame.
2008-07-17 19:45:17 -04:00
Greg Von Kuster 8ce37ea721 Fix for Tabular.set_meta() - when column contains no values, default column type metadata to string. 2008-07-17 14:58:30 -04:00
Nate Coraor 8e8c1c9cf2 Basic $REMOTE_USER support.
A database change is necessary:

ALTER TABLE galaxy_user ADD COLUMN external boolean;

To use:

http://g2.trac.bx.psu.edu/wiki/HowToInstall/ApacheProxy

I've tried to be as friendly as possible with respect to enabling and
disabling $REMOTE_USER support.  If you have an existing server and
enable use_remote_user, users whose external login matches their Galaxy
username will have access to their existing history/session.  If the
logins don't match, any existing credentials they had are destroyed.
Likewise, when disabled, users who weren't created automatically may
continue to access their histories/sessions.  Automatically created
users are logged out, and can't log in unless enabled by an administrator.
2008-07-17 09:15:38 -04:00
James Taylor 8cb0cc1edd Don't use redirects in workflow to avoid a really annoying safari
history bug. Use programatically generated form in 'rename'.
2008-07-14 21:41:29 -04:00
James Taylor c8d610fa63 Remove javascript log messages 2008-07-14 21:39:28 -04:00
James Taylor c3a76ab7d5 Fix popup menu positioning 2008-07-14 21:39:08 -04:00
James Taylor d31352b754 Wrong closing tag. 2008-07-14 20:19:17 -04:00
James Taylor 8337083dcf Reformatting the workflow index page. The "new workflow" form is now just a
button, and the actions are now popup menus (all progressive enhancement).
2008-07-14 19:48:52 -04:00
James Taylor ab6c577e85 Javascript to support popup menus. 2008-07-14 19:47:32 -04:00
James Taylor 9c1474f810 Styles for buttons and popup menus. 2008-07-14 19:47:08 -04:00
James Taylor 319c7e9b03 Some helpers in the framework to make it easier to return programatically generated forms. 2008-07-14 19:41:49 -04:00
James Taylor 538dacd45d Icon for "add" buttons. 2008-07-14 19:39:19 -04:00
James Taylor 87206a4385 Update "setup.sh" to reflect change from datatypes_conf.xml.sample to datatypes_conf.xml.sample 2008-07-14 19:35:46 -04:00
Nate Coraor 4288692d42 Please welcome your new friend, Mercurial.
http://www.selenic.com/mercurial/

Developers can clone a fresh repository like this:

hg clone ssh://coltrane.bx.psu.edu//depot/projects/universe/hg galaxy_dist

That extra / between coltrane and depot is required.

Read-only access is available in many ways:

Via Mercurial:	hg clone http://www.bx.psu.edu/hg/galaxy
Via Subversion: svn co http://www.bx.psu.edu/svn/galaxy
Via Tarball:	wget http://www.bx.psu.edu/hg/galaxy/archive/tip.tar.gz

Note that the Subversion repo address is not the same as the old one.
This is unavoidable since to continue to support SVN checkouts, we had
to convert Subversion->Mercurial->Subversion.

Please let me know ASAP of any issues (especially errors on an 'hg
push' so I can get them fixed quickly.
2008-07-14 17:04:16 -04:00
Nate Coraor 273499a178 Duh, helps to have an on_commit scheduler... 2008-07-14 14:03:02 -04:00
Nate Coraor b49c1d9f24 More testing - buildbot is notified but (I think due to a branch
mismatch) isn't building.
2008-07-14 13:57:06 -04:00
Nate Coraor af80e18d3b Buildbot setup also needs the directory creation glue. 2008-07-14 13:42:57 -04:00
Nate Coraor 91004ae25a Interoperability with hg 1.0 and buildbot was causing buildbot notify
to fail... so, maybe I can has buildbot this time?
2008-07-14 13:20:28 -04:00
Nate Coraor fe0f91cfa8 More testing, email and buildbot didn't work due to outdated buildbot
library on scofield.
2008-07-14 12:32:56 -04:00
Nate Coraor c4573347d2 Testing hg->buildbot, and notification mail. 2008-07-14 12:21:54 -04:00
Nate Coraor 0e0204e1dc Mercurial doesn't track directories, so these need to be created
automatically at setup time.
2008-07-14 12:15:26 -04:00
James Taylor 0a19252676 Missing separator (visual only). 2008-07-14 02:00:16 +00:00
James Taylor 6906f5a048 Support for sharing workflows (as well as renaming). A shared workflow is
read only for the recipient, however they can always run the latest version of
the workflow. They can also 'clone' the workflow to create their own editable
copy of the current version.
2008-07-14 01:56:50 +00:00
James Taylor 0071b7389e Fix rendering of Select parameters as_display_text when no value is selected. 2008-07-14 01:54:10 +00:00
James Taylor 24fed10a05 Add appropriate padding for table headers. 2008-07-14 01:53:10 +00:00
Greg Von Kuster 3de877519e Migrate cleanup_datasets script to work with new db schema. 2008-07-10 19:54:46 +00:00
James Taylor e0eeef9e43 jquery-ui 1.5.2 (various upstream bug fixes). 2008-07-10 19:29:25 +00:00
James Taylor 1e707938a5 Fix documentation comment in topsort.py 2008-07-10 16:21:27 +00:00
Daniel Blankenberg 1e1a3e81bf Update to latest version (June 30, 2008) of GMAJ. 2008-07-09 19:07:03 +00:00
Daniel Blankenberg 28b89d686f Change database schema to separate Dataset and HistoryDatasetAssociation. This is a significant change, be sure to follow the migration notes exactly.
Make sure to backup your database before updating.


Also fix a long standing bug in the async controller dealing with updating output datasets upon job completion.


Credit for database migration directions go to Greg.

*** This is a significant change, be sure to follow the migration steps below exactly and in order: ***

---------------

0. Stop Galaxy server

---------------

1. Backup database and galaxy_root/database directory

---------------

2. The current validation_error table is not being used, it is left over from Ian's work that was not made functional.  However, if we want to keep it around, we should drop the old version of the table so it will get re-created correctly when the Galaxy server is restarted:

any database - sql command(s):
------------------------------
DROP TABLE validation_error;

---------------

3. Stop server, perform svn update to get latest code, start server to create new history_dataset_association and implicitly_converted_dataset_association tables

---------------

4. Add new columns to dataset table:

postgres sql command(s):
------------------------
ALTER TABLE dataset ADD COLUMN purgable boolean DEFAULT 't';
ALTER TABLE dataset ADD COLUMN external_filename text;
ALTER TABLE dataset ADD COLUMN _extra_files_path text;

mysql sql command(s):
---------------------
ALTER TABLE dataset ADD COLUMN purgable boolean DEFAULT TRUE;
ALTER TABLE dataset ADD COLUMN external_filename text;
ALTER TABLE dataset ADD COLUMN _extra_files_path text;

sqlite sql command(s):
----------------------
ALTER TABLE dataset ADD COLUMN purgable boolean DEFAULT 0;
ALTER TABLE dataset ADD COLUMN external_filename text;
ALTER TABLE dataset ADD COLUMN _extra_files_path text;

---------------

5. Populate new columns:

postgres sql command(s):
------------------------
UPDATE
dataset
SET
external_filename = dataset_filename.filename,
_extra_files_path = dataset_filename.extra_files_path
FROM
dataset_filename
WHERE
dataset.filename_id = dataset_filename.id;

mysql or sqlite sql command(s):
-------------------------------
UPDATE
dataset,
dataset_filename
SET
dataset.external_filename = dataset_filename.filename,
dataset._extra_files_path = dataset_filename.extra_files_path
WHERE
dataset.filename_id = dataset_filename.id;

---------------

6. Populate dataset table with info from dataset_child_association table:

postgres sql command(s):
------------------------
UPDATE
dataset
SET
parent_id = dataset_child_association.parent_dataset_id
FROM
dataset_child_association
WHERE
dataset.id = dataset_child_association.child_dataset_id;

mysql or sqlite sql command(s):
-------------------------------
UPDATE
dataset,
dataset_child_association
SET
dataset.parent_id = dataset_child_association.parent_dataset_id
WHERE
dataset.id = dataset_child_association.child_dataset_id;

---------------

7. Drop dataset_child_association table:

any database - sql command(s):
------------------------------
DROP TABLE dataset_child_association;

---------------

8. Copy parts of the current dataset table to the new history_dataset_association table:

postgres sql command(s):
------------------------
INSERT INTO history_dataset_association
SELECT
id,
history_id,
id AS dataset_id,
create_time,
update_time,
hid,
name,
info,
blurb,
peek,
extension,
metadata,
parent_id,
designation,
deleted,
visible
FROM dataset
ORDER BY id;

mysql or sqlite sql command(s):
-------------------------------
INSERT INTO
history_dataset_association
(
history_id,
dataset_id,
create_time,
update_time,
hid,
name,
info,
blurb,
peek,
extension,
metadata,
parent_id,
designation,
deleted,
visible
)
SELECT
history_id,
id,
create_time,
update_time,
hid,
name,
info,
blurb,
peek,
extension,
metadata,
parent_id,
designation,
deleted,
visible
FROM
dataset
ORDER BY
id;

---------------

9. Update the nextval value of the primary key sequence in the history_dataset_association table

NOTE: THIS IS NOT NECESSARY FOR MYSQL OR SQLITE!

postgres sql command(s):
------------------------
SELECT
setval('history_dataset_association_id_seq', max(id))
FROM
history_dataset_association;

---------------

10. Update dataset table to mark dataset_associated_file dataset as deleted:

postgres sql command(s):
------------------------
UPDATE dataset
SET
deleted = 't'
WHERE
id IN
(SELECT dataset_id FROM dataset_associated_file ORDER BY dataset_id DESC);

mysql or sqlite sql command(s):
-------------------------------
UPDATE dataset
SET
deleted = TRUE
WHERE
id IN
(SELECT dataset_id FROM dataset_associated_file ORDER BY dataset_id DESC);

---------------

11. Drop the dataset_associated_file table:

any database - sql command(s):
------------------------------
DROP TABLE dataset_associated_file;

---------------

12. Alter foreign keys on job_to_input_dataset table:

postgres or sqlite sql command(s):
------------------------
ALTER TABLE
job_to_input_dataset
DROP CONSTRAINT
job_to_input_dataset_dataset_id_fkey;

ALTER TABLE
job_to_input_dataset
ADD CONSTRAINT job_to_input_dataset_dataset_id_fkey
FOREIGN KEY
(dataset_id)
REFERENCES
history_dataset_association(id);


mysql sql command(s):
-------------------------------
ALTER TABLE
job_to_input_dataset
DROP FOREIGN KEY
ix_job_to_input_dataset_dataset_id;

ALTER TABLE
job_to_input_dataset
ADD FOREIGN KEY
ix_job_to_input_dataset_dataset_id (dataset_id)
REFERENCES
history_dataset_association(id);

---------------

13. Alter foreign keys on job_to_output_dataset table:

postgres or sqlite sql command(s):
------------------------
ALTER TABLE
job_to_output_dataset
DROP CONSTRAINT
job_to_output_dataset_dataset_id_fkey;

ALTER TABLE
job_to_output_dataset
ADD CONSTRAINT
job_to_output_dataset_dataset_id_fkey
FOREIGN KEY (dataset_id)
REFERENCES history_dataset_association(id);

mysql sql command(s):
-------------------------------
ALTER TABLE
job_to_output_dataset
DROP FOREIGN KEY
ix_job_to_output_dataset_dataset_id;

ALTER TABLE
job_to_output_dataset
ADD FOREIGN KEY
ix_job_to_output_dataset_dataset_id
FOREIGN KEY (dataset_id)
REFERENCES history_dataset_association(id);

---------------

14. Eliminate columns from the dataset table previously copied to history_dataset_association:

any database - sql command(s):
------------------------------
ALTER TABLE dataset DROP COLUMN hid;
ALTER TABLE dataset DROP COLUMN history_id;
ALTER TABLE dataset DROP COLUMN name;
ALTER TABLE dataset DROP COLUMN info;
ALTER TABLE dataset DROP COLUMN blurb;
ALTER TABLE dataset DROP COLUMN peek;
ALTER TABLE dataset DROP COLUMN extension;
ALTER TABLE dataset DROP COLUMN dbkey;
ALTER TABLE dataset DROP COLUMN metadata;
ALTER TABLE dataset DROP COLUMN parent_id;
ALTER TABLE dataset DROP COLUMN designation;
ALTER TABLE dataset DROP COLUMN visible;
ALTER TABLE dataset DROP COLUMN filename_id;
2008-07-09 17:41:08 +00:00