projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
2872: Merge branch 'master' into 2872-folder-nav
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
collection.rb
diff --git
a/apps/workbench/app/models/collection.rb
b/apps/workbench/app/models/collection.rb
index 4f4a79035474196c8e19dcd3a1e8f54c6bb7c091..008d108fd43ed8a7e0a3abe45cc380492b03ba4b 100644
(file)
--- a/
apps/workbench/app/models/collection.rb
+++ b/
apps/workbench/app/models/collection.rb
@@
-6,7
+6,7
@@
class Collection < ArvadosBase
!!locator.to_s.match("^#{MD5_EMPTY}(\\+.*)?\$")
end
- def self.goes_in_
folder
s?
+ def self.goes_in_
project
s?
true
end
@@
-21,6
+21,8
@@
class Collection < ArvadosBase
tot += file[2]
end
tot
+ else
+ 0
end
end