[ARVADOS] updated: d95550d1827701788a59b2c834caddf4e3e1729d

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/upload_to_collection.js | 10 ++++++----
 apps/workbench/app/views/projects/show.html.erb               |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

       via  d95550d1827701788a59b2c834caddf4e3e1729d (commit)
       via  fc8881447e9a0072206a08feedf9a9a40b770a3a (commit)
      from  0d01ca86e6c73cb31efed555cbc645a8afab32eb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d95550d1827701788a59b2c834caddf4e3e1729d
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Nov 24 04:09:18 2014 -0500

    3781: Name new collection "New collection".

diff --git a/apps/workbench/app/views/projects/show.html.erb b/apps/workbench/app/views/projects/show.html.erb
index 9869577..3d9c634 100644
--- a/apps/workbench/app/views/projects/show.html.erb
+++ b/apps/workbench/app/views/projects/show.html.erb
@@ -23,7 +23,7 @@
           <% end %>
         </li>
         <li>
-          <%= link_to(collections_path(collection: {manifest_text: "", owner_uuid: @object.uuid}, redirect_to_anchor: 'Upload'),
+          <%= link_to(collections_path(collection: {manifest_text: "", name: "New collection", owner_uuid: @object.uuid}, redirect_to_anchor: 'Upload'),
               { method: 'post', title: "Add data to this project", data: {'event-after-select' => 'page-refresh', 'toggle' => 'dropdown'} }) do %>
             <i class="fa fa-fw fa-upload"></i> ...from your computer
           <% end %>

commit fc8881447e9a0072206a08feedf9a9a40b770a3a
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Nov 24 04:09:03 2014 -0500

    3781: Fix reject reasons.

diff --git a/apps/workbench/app/assets/javascripts/upload_to_collection.js b/apps/workbench/app/assets/javascripts/upload_to_collection.js
index 8a1d354..c4fbf67 100644
--- a/apps/workbench/app/assets/javascripts/upload_to_collection.js
+++ b/apps/workbench/app/assets/javascripts/upload_to_collection.js
@@ -169,7 +169,7 @@ function FileUploader($scope, $q, file) {
         statistics: null,
         go: function() {
             if (this._deferred)
-                this._deferred.reject(null, 'Restarted', null);
+                this._deferred.reject({textStatus: 'restarted'});
             this._deferred = $q.defer();
             this.statistics = 'Starting';
             this.state = 'Uploading';
@@ -181,7 +181,7 @@ function FileUploader($scope, $q, file) {
         stop: function() {
             if (this._deferred) {
                 this.state = 'Paused';
-                this._deferred.reject(null, 'Interrupted', null);
+                this._deferred.reject({textStatus: 'interrupted'});
             }
             if (this._currentUploader) {
                 this._currentUploader.stop();
@@ -225,8 +225,10 @@ function FileUploader($scope, $q, file) {
             if (!locator || that._currentSlice.size != dataSize) {
                 console.log("onUploaderResolve but locator=" + locator +
                             " and " + that._currentSlice.size + " != " + dataSize);
-                return that.onUploaderReject(
-                    null, "Error", "Bad response from slice upload");
+                return that.onUploaderReject({
+                    textStatus: "Error",
+                    err: "Bad response from slice upload"
+                });
             }
             that.locators.push(locator);
             that._readPos += dataSize;

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


hooks/post-receive
--