Tom Clegg [Mon, 28 Jul 2014 19:45:23 +0000 (15:45 -0400)]
3235: Merge branch 'master' into 3235-top-nav-site-search
Conflicts:
apps/workbench/app/assets/javascripts/infinite_scroll.js
apps/workbench/app/views/application/_choose.html.erb
apps/workbench/app/views/layouts/application.html.erb
Tom Clegg [Sun, 27 Jul 2014 22:35:46 +0000 (18:35 -0400)]
3235: Bind Esc key to close modals.
Tom Clegg [Sun, 27 Jul 2014 22:28:18 +0000 (18:28 -0400)]
3235: Focus search box when chooser modal appears.
Tom Clegg [Sun, 27 Jul 2014 22:22:53 +0000 (18:22 -0400)]
3235: Show project filter by default (i.e., unless by_project=false).
Tom Clegg [Sun, 27 Jul 2014 22:03:13 +0000 (18:03 -0400)]
3235: Fix "no filter / all projects" option.
Tom Clegg [Sun, 27 Jul 2014 21:58:17 +0000 (17:58 -0400)]
3235: Fix multiple-select.
Tom Clegg [Sun, 27 Jul 2014 21:48:28 +0000 (17:48 -0400)]
3235: Make filter-by-project play nice with infinite scroll.
Tom Clegg [Sun, 27 Jul 2014 19:34:31 +0000 (15:34 -0400)]
3235: Hide section header rows for empty sections. closes #3377
Tom Clegg [Sun, 27 Jul 2014 19:22:38 +0000 (15:22 -0400)]
3235: Fix infinite scroll in Search chooser.
Tom Clegg [Sun, 27 Jul 2014 19:19:49 +0000 (15:19 -0400)]
3235: Infinite scroll error handling: Show error message and "Retry" button
instead of immediately repeating the failed request ad infinitum.
Tom Clegg [Sat, 26 Jul 2014 21:23:42 +0000 (17:23 -0400)]
3235: Skip data-remote links in smoke test. They might not know format=html.
Tom Clegg [Sat, 26 Jul 2014 21:08:45 +0000 (17:08 -0400)]
3235: Show multiple object types in top-nav Search modal.
Tom Clegg [Fri, 25 Jul 2014 20:22:54 +0000 (16:22 -0400)]
Merge branch '3286-home-button' closes #3286
Tom Clegg [Fri, 25 Jul 2014 19:26:31 +0000 (15:26 -0400)]
3286: Split Home/Projects thing into Home button and Projects dropdown.
Tom Clegg [Fri, 25 Jul 2014 17:51:51 +0000 (13:51 -0400)]
Do not remove /dev/stdout on interrupt signal. No issue #
Tom Clegg [Fri, 25 Jul 2014 17:49:27 +0000 (13:49 -0400)]
3235: Add test case.
Brett Smith [Fri, 25 Jul 2014 12:04:33 +0000 (08:04 -0400)]
Merge branch 'staging'
Closes #3315. Thanks Guillermo!
Guillermo Carrasco [Wed, 9 Jul 2014 19:02:27 +0000 (15:02 -0400)]
Create temporary directory if it does not exist
Tom Clegg [Fri, 25 Jul 2014 02:10:30 +0000 (22:10 -0400)]
3235: Fix SQL query.
Tom Clegg [Thu, 24 Jul 2014 23:03:35 +0000 (19:03 -0400)]
3235: Split GroupsController#contents logic out to load_searchable_objects.
Brett Smith [Thu, 24 Jul 2014 20:18:35 +0000 (16:18 -0400)]
3321: Workbench copes when pipeline components have an odd form.
Closes #3321.
Ward Vandewege [Thu, 24 Jul 2014 16:58:43 +0000 (12:58 -0400)]
Add Keep install instructions (manual).
no issue #
Brett Smith [Thu, 24 Jul 2014 15:03:04 +0000 (11:03 -0400)]
Merge branch '3200-ajax-error-handling'
Closes #3200, #3207, #3251, #3276, #3322.
Brett Smith [Wed, 23 Jul 2014 20:50:18 +0000 (16:50 -0400)]
3200: Improve error handling in Workbench's API client.
* Fix the class used for error responses that can be parsed but don't
have a dedicated subclass.
* Ensure that exception.api_response[:errors] is always an array.
This improves the error reporting for #3207.
Brett Smith [Wed, 23 Jul 2014 20:29:12 +0000 (16:29 -0400)]
3200: X-Editable renders errors even without a message array.
The previous version was causing the X-Editable popup to spin
infinitely when the JSON errors were null. See #3207, #3251.
Brett Smith [Tue, 22 Jul 2014 22:04:58 +0000 (18:04 -0400)]
3200: Workbench copes better when a tab fails to load.
Brett Smith [Tue, 22 Jul 2014 20:12:59 +0000 (16:12 -0400)]
2044: Improve reporting when project sharing fails.
Our select modal knows how to render an errors key in the JSON
response. This commit adjusts the project controller to conform to
this convention. Refs #2044, #3200.
Tim Pierce [Tue, 22 Jul 2014 20:10:24 +0000 (16:10 -0400)]
Merge branch '2769-keep-delete-request'
Refs #2769
Tim Pierce [Tue, 22 Jul 2014 20:09:28 +0000 (16:09 -0400)]
2769: reorganize REST handlers
Reorganizing REST handlers into their own source file.
Refs #2769.
Tom Clegg [Mon, 21 Jul 2014 22:27:03 +0000 (18:27 -0400)]
Fix extra row left behind after deleting a pipeline instance. closes #2929
Brett Smith [Mon, 21 Jul 2014 20:57:07 +0000 (16:57 -0400)]
2044: Make project sharing tests more forgiving of Ajax timing.
Apparently waiting our default 5 seconds is not always sufficient to
get an Ajax response that requires a roundtrip to the API server.
Wait longer in these cases. Not the most elegant solution, but I
don't see a better option. Refs #2044.
Brett Smith [Mon, 21 Jul 2014 20:24:37 +0000 (16:24 -0400)]
2044: Workbench resource lists support Enumerable-style select.
Refs #2044. Enumerable-style select is used in places like the groups
index.
Tim Pierce [Mon, 21 Jul 2014 19:35:29 +0000 (15:35 -0400)]
Merge branch '3072-empty-collection-bugfix'
closes #3072.
radhika [Mon, 21 Jul 2014 19:03:49 +0000 (15:03 -0400)]
closes #3140
Merge branch '3140-project-content-tabs'
radhika [Mon, 21 Jul 2014 19:03:33 +0000 (15:03 -0400)]
Merge branch 'master' into 3140-project-content-tabs
radhika [Mon, 21 Jul 2014 19:02:25 +0000 (15:02 -0400)]
Merge branch 'master' into 3140-project-content-tabs
Conflicts:
apps/workbench/app/controllers/projects_controller.rb
Tim Pierce [Mon, 21 Jul 2014 18:56:17 +0000 (14:56 -0400)]
3072: rendering "Empty Collection" in default_name
Collection.default_name now renders "Empty Collection" for collection
d41d8cd98f00b204e9800998ecf8427e.
Refs #3072.
Tom Clegg [Mon, 21 Jul 2014 18:52:35 +0000 (14:52 -0400)]
Merge branch '3182-workbench-test-race'
closes #3182
Tom Clegg [Mon, 21 Jul 2014 18:50:10 +0000 (14:50 -0400)]
3182: Fix races by using find() instead of {sleep; page.has_text?}.
Tom Clegg [Mon, 21 Jul 2014 18:30:05 +0000 (14:30 -0400)]
3235: Fix errant merge.
Tom Clegg [Mon, 21 Jul 2014 18:28:17 +0000 (14:28 -0400)]
3235: Merge branch 'master' into 3235-top-nav-site-search
Conflicts:
apps/workbench/app/views/application/_choose.html.erb
Tom Clegg [Mon, 21 Jul 2014 18:17:34 +0000 (14:17 -0400)]
3235: Fix project dropdown, use it when choosing collections.
Tom Clegg [Mon, 21 Jul 2014 18:15:13 +0000 (14:15 -0400)]
Remove extra spinner. closes #3301
Tom Clegg [Mon, 21 Jul 2014 17:37:53 +0000 (13:37 -0400)]
3170: Use find().all() instead of page.all() to accommodate ajax content. refs #3170, #2044
Tom Clegg [Mon, 21 Jul 2014 17:24:28 +0000 (13:24 -0400)]
3170: Fix stale use of tab_pane_valid_state. refs #3170
Tom Clegg [Mon, 21 Jul 2014 17:20:51 +0000 (13:20 -0400)]
3235: Hide projects dropdown unless caller asked for it.
Tom Clegg [Mon, 21 Jul 2014 17:02:17 +0000 (13:02 -0400)]
Merge branch '3170-refresh-tab-pane'
closes #3170
Tom Clegg [Mon, 21 Jul 2014 17:00:42 +0000 (13:00 -0400)]
3170: Merge branch 'master' into 3170-refresh-tab-pane
Tom Clegg [Mon, 21 Jul 2014 17:00:34 +0000 (13:00 -0400)]
3170: Add comments.
Brett Smith [Mon, 21 Jul 2014 16:42:03 +0000 (12:42 -0400)]
Merge branch '2044-workbench-project-sharing'
Closes #2044, #2749, #3238.
Brett Smith [Tue, 15 Jul 2014 20:16:38 +0000 (16:16 -0400)]
2044: Add Workbench interface to manage project sharing.
This empowers administrators to add, modify, and remove permission
links on projects.
Brett Smith [Mon, 21 Jul 2014 16:18:24 +0000 (12:18 -0400)]
2044: Workbench route to share a project with others.
This route is intended to support AJAX requests from the interface to
share a project with one or more users/groups.
Brett Smith [Thu, 17 Jul 2014 15:39:24 +0000 (11:39 -0400)]
2044: Workbench can query the API /permissions method.
Brett Smith [Tue, 15 Jul 2014 19:35:12 +0000 (15:35 -0400)]
2044: Add more helpers to get FA icons for objects.
Brett Smith [Thu, 3 Jul 2014 18:10:31 +0000 (14:10 -0400)]
2044: Workbench supports API select parameter.
This can help ensure symmetry between admin and non-admin requests for
the user index.
Brett Smith [Fri, 18 Jul 2014 20:13:11 +0000 (16:13 -0400)]
2044: API server lets group managers see group permission links.
This implementation hooks into find_object_by_uuid because that was
the simplest thing that could work and unblock larger development on
this story. Longer-term, we would like to solve this problem more
generally. See the comments added to the links controller test for
more explanation about that.
Brett Smith [Mon, 14 Jul 2014 21:07:39 +0000 (17:07 -0400)]
2044: All users can give all other users folder permissions.
This supports a Workbench sharing button, the same way that the
changes to users#index does.
Brett Smith [Mon, 21 Jul 2014 15:33:30 +0000 (11:33 -0400)]
3303: Add logfile support to arv-mount.
The primary thrust of this commit is to teach arv-mount to log to a
file. This can help make it easier to track down exceptions that
happen while the process is daemonized.
To support better logging information, it also sends exception
tracebacks directly to the log. This required reorganizing the code
to daemonize earlier.
Refs #3303.
Tom Clegg [Sat, 19 Jul 2014 01:34:06 +0000 (21:34 -0400)]
3235: Top nav "search" button opens a collection chooser.
Tom Clegg [Sat, 19 Jul 2014 00:45:46 +0000 (20:45 -0400)]
Merge branch '3214-permission-to-use-owner-uuid'
closes #3214
Tom Clegg [Sat, 19 Jul 2014 00:45:27 +0000 (20:45 -0400)]
3214: Merge branch 'master' into 3214-permission-to-use-owner-uuid
Tom Clegg [Fri, 18 Jul 2014 21:37:05 +0000 (17:37 -0400)]
3214: Readability: rearrange conditionals, and say "old" instead of "existing"
Tom Clegg [Fri, 18 Jul 2014 21:35:05 +0000 (17:35 -0400)]
3214: Split independent unit tests into separate test cases.
Tim Pierce [Thu, 17 Jul 2014 18:41:12 +0000 (14:41 -0400)]
3072: anonymous group can_read empty collection
empty_collection is owned by the system user, like all other
collections. When it is created, a permission link is also created
giving the anonymous group permission to read it.
Added test fixtures for the empty collection and its associated
permission link.
Workbench renders links to the empty collection as "Empty Collection".
The unit test and integration tests focus just on the empty
collection (other collection ownership/readability issues will be
addressed elsewhere).
radhika [Fri, 18 Jul 2014 15:27:36 +0000 (11:27 -0400)]
Merge branch 'master' into 3140-project-content-tabs
radhika [Fri, 18 Jul 2014 15:26:34 +0000 (11:26 -0400)]
3140: fix tests to match the project content display related ui updates
Brett Smith [Fri, 18 Jul 2014 15:06:02 +0000 (11:06 -0400)]
3252: Include README in Python source manifest.
The real issue with our Python package builds is that this file isn't
being included, which causes setup.py to fail when it's run from a
source tarfile. It *is* being included on my box, but that seems to
be because of extra information from git, or lingering information in
my .egg-info directory. This change should make sure README is
included when a clean sdist is prepared.
This reverts commit
e16c1ecc8097fd586e86fc90206836000b5f5004,
since that wasn't the real bugfix. Refs #3252.
radhika [Fri, 18 Jul 2014 15:04:31 +0000 (11:04 -0400)]
closes #3160
Merge branch '3160-copy-unnamed-pipeline'
radhika [Fri, 18 Jul 2014 14:44:26 +0000 (10:44 -0400)]
Merge branch 'master' into 3160-copy-unnamed-pipeline
radhika [Fri, 18 Jul 2014 14:43:10 +0000 (10:43 -0400)]
3160: use blank name when copying any object with no name, not just pipeline instances.
Brett Smith [Fri, 18 Jul 2014 13:52:27 +0000 (09:52 -0400)]
3252: Fix README location in setup.py scripts.
Refs #3252.
Brett Smith [Fri, 18 Jul 2014 13:30:51 +0000 (09:30 -0400)]
Merge branch '3252-py-sdk-install-docs-wip'
Closes #3252.
Tom Clegg [Fri, 18 Jul 2014 06:43:17 +0000 (02:43 -0400)]
3170: On pipeline instance page, refresh the tab panes rather than the entire page.
Tom Clegg [Fri, 18 Jul 2014 06:08:43 +0000 (02:08 -0400)]
3170: Root out evil runtime-generated javascript. Simplify tab loading.
Tom Clegg [Fri, 18 Jul 2014 05:06:42 +0000 (01:06 -0400)]
3214: Fix unclosed HTML tag.
Tom Clegg [Fri, 18 Jul 2014 05:00:47 +0000 (01:00 -0400)]
3214: Ensure current_user has write permission on the new owner when setting owner_uuid.
Tom Clegg [Thu, 17 Jul 2014 20:51:22 +0000 (16:51 -0400)]
3214: "New project" link in top nav dropdown create a new project at top level, instead of inside the current project.
radhika [Fri, 18 Jul 2014 01:11:40 +0000 (21:11 -0400)]
3160: use blank name when copying an unnamed pipeline instance.
Brett Smith [Thu, 17 Jul 2014 21:36:36 +0000 (17:36 -0400)]
3252: Add Python package documentation.
This documentation will be displayed nicely on both GitHub and PyPI.
Brett Smith [Thu, 17 Jul 2014 20:41:29 +0000 (16:41 -0400)]
3252: Make Python tests runnable from setup.py.
This does a couple of things for us:
* It makes the tests more discoverable and easier to run, which makes
for cleaner documentation. The new command to run tests is
`python setup.py test` (the old command still works too).
* Because the test dependencies are expressed in setup.py, we can get
rid of duplication from keeping around requirements.txt.
radhika [Thu, 17 Jul 2014 11:31:31 +0000 (07:31 -0400)]
3140: this file is not longer used. instead, other files are introduced to replace it.
radhika [Thu, 17 Jul 2014 11:05:00 +0000 (07:05 -0400)]
Merge branch 'master' into 3140-project-content-tabs
radhika [Thu, 17 Jul 2014 11:03:38 +0000 (07:03 -0400)]
3140: apply infinite scrolling if the container is visible, when working with multiple containers in window.
radhika [Thu, 17 Jul 2014 03:06:42 +0000 (23:06 -0400)]
3140: infinite-scroller
Ward Vandewege [Wed, 16 Jul 2014 14:05:33 +0000 (10:05 -0400)]
Do not set action_mailer config settings in production.rb.example, we
configure these via application(.defaults).yml now.
no issue #
Tom Clegg [Wed, 16 Jul 2014 13:36:19 +0000 (09:36 -0400)]
3220: Merge branch '3220-http-status-codes' closes #3220
Tom Clegg [Wed, 16 Jul 2014 13:35:57 +0000 (09:35 -0400)]
3220: Fix whitespace
radhika [Tue, 15 Jul 2014 20:21:18 +0000 (16:21 -0400)]
Merge branch 'master' into 3140-project-content-tabs
radhika [Tue, 15 Jul 2014 20:19:37 +0000 (16:19 -0400)]
closes #3106
Merge branch '3106-modal-loading-indicator'
radhika [Tue, 15 Jul 2014 20:16:00 +0000 (16:16 -0400)]
Merge branch 'master' into 3106-modal-loading-indicator
Tim Pierce [Mon, 14 Jul 2014 18:01:28 +0000 (14:01 -0400)]
3072: add an empty collection in db seeds
Added empty collection (owned by the anonymous group) to test fixtures
and to db/seeds.rb.
API integration tests: in permissions_test.rb, test that the active user
can read objects in the anonymous group, even when there are no explicit
permission links on that group or objects in it.
Workbench integration tests: added a test to confirm that a non-admin
user can get the empty collection.
Cleanup code: User.can? now takes either a uuid or an object for the target.
Refs #3072.
Ward Vandewege [Tue, 15 Jul 2014 18:21:57 +0000 (14:21 -0400)]
3220: fix tests
Brett Smith [Tue, 15 Jul 2014 17:02:03 +0000 (13:02 -0400)]
3195: Add job reuse test.
I wrote this while debugging a user-reported issue. Ultimately the
issue ended up being a bug in the database, but no point letting a
good test go to waste.
Refs #3195.
radhika [Tue, 15 Jul 2014 14:48:14 +0000 (10:48 -0400)]
3140: search in a tab should update results for that tab
radhika [Tue, 15 Jul 2014 02:08:15 +0000 (22:08 -0400)]
3140: use correct id for scroller
radhika [Tue, 15 Jul 2014 01:46:20 +0000 (21:46 -0400)]
Merge branch 'master' into 3140-project-content-tabs
Brett Smith [Mon, 14 Jul 2014 21:11:16 +0000 (17:11 -0400)]
Merge branch '3195-bugfix-job-min-script-ver'
Closes #3195. There may be other issues here but we need more
information to debug them.
Brett Smith [Tue, 8 Jul 2014 17:01:44 +0000 (13:01 -0400)]
Improve API server's git rev-list calls.
This doesn't completely silence errors, but it makes them less verbose
and prevents git from trying to look up paths, which we never want.
Brett Smith [Tue, 8 Jul 2014 13:49:16 +0000 (09:49 -0400)]
3195: Improve error handling in Job creation API.
* Express the default filters using high-level operators, then convert
them to SQL filters using the same conversion logic users get.
* Raise an ArgumentError when a git version search fails.
* Render normal error pages from ArgumentErrors.
Brett Smith [Mon, 14 Jul 2014 19:10:44 +0000 (15:10 -0400)]
Merge branch '2044-api-users-index-wip'
Refs #2044. Closes #3217.