[ARVADOS] updated: 2f464437d84aaccd5310d39e493767f93b0eab2c

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/collections_controller.rb      |    3 ++-
 apps/workbench/app/views/collections/index.js.erb  |    2 ++
 services/api/app/models/collection.rb              |    8 +++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

       via  2f464437d84aaccd5310d39e493767f93b0eab2c (commit)
       via  356878b49264fc1b2841e2a89d4406d2c5c4484a (commit)
       via  9feb81aabda1360618b363c65e190374091f6ff2 (commit)
      from  36601cdb390b06d0128152cbda6df7aadfab6aca (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 2f464437d84aaccd5310d39e493767f93b0eab2c
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jan 13 10:13:19 2014 -0800

    Unescape filenames from manifests. refs #1849

diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index df84b09..9951044 100644
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -78,7 +78,13 @@ class Collection < ArvadosModel
           @data_size += blocksize if @data_size
         else
           if (re = tok.match /^(\d+):(\d+):(\S+)$/)
-            @files << [toks[0], re[3], re[2].to_i]
+            filename = re[3].gsub /\\(\\|[0-7]{3})/ do |escape_sequence|
+              case $1
+              when '\\' '\\'
+              else $1.to_i(8).chr
+              end
+            end
+            @files << [toks[0], filename, re[2].to_i]
           end
         end
       end

commit 356878b49264fc1b2841e2a89d4406d2c5c4484a
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jan 13 10:11:40 2014 -0800

    Update query in browser location bar when showing search results.
    
    refs #1499

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 4b79a6d..fe861eb 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -39,6 +39,7 @@ class CollectionsController < ApplicationController
       end
       info[:links] << link
     end
+    @request_url = request.url
   end
 
   def show_file
diff --git a/apps/workbench/app/views/collections/index.js.erb b/apps/workbench/app/views/collections/index.js.erb
index cbe1096..44839f4 100644
--- a/apps/workbench/app/views/collections/index.js.erb
+++ b/apps/workbench/app/views/collections/index.js.erb
@@ -1,2 +1,4 @@
+if(history.replaceState)
+    history.replaceState(null, null, "<%= escape_javascript(@request_url) %>");
 $('table#collections-index tbody').html("<%= escape_javascript(render partial: 'index_tbody') %>");
 $('table#collections-index tbody').fadeTo(200, 1.0);

commit 9feb81aabda1360618b363c65e190374091f6ff2
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jan 13 10:10:55 2014 -0800

    Fix crash if no search parameter given.
    
    refs #1499

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index f0e7765..4b79a6d 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -7,7 +7,7 @@ class CollectionsController < ApplicationController
   end
 
   def index
-    if params[:search].andand.length > 0
+    if params[:search].andand.length.andand > 0
       tags = Link.where(link_class: 'tag', any: ['contains', params[:search]])
       @collections = Collection.where(uuid: tags.collect(&:head_uuid))
     else

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


hooks/post-receive
--