From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Mon, 10 Mar 2014 21:08:46 +0000 (-0400)
Subject: Merge branch '2042-new-collection-from-selected-files'
X-Git-Tag: 1.1.0~2709^2~114
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c912d9d8d9e2a055a53967c5b01242c321dfbeb6

Merge branch '2042-new-collection-from-selected-files'
---

c912d9d8d9e2a055a53967c5b01242c321dfbeb6
diff --cc apps/workbench/app/assets/javascripts/editable.js
index adb49d7c15,79bad15e77..e37b9444c1
--- a/apps/workbench/app/assets/javascripts/editable.js
+++ b/apps/workbench/app/assets/javascripts/editable.js
@@@ -9,9 -17,3 +17,9 @@@ $.fn.editable.defaults.params = functio
      a[key][params.name] = params.value;
      return a;
  };
 +
 +$.fn.editable.defaults.validate = function (value) {
 +    if (value == "***invalid***") {
 +        return "Invalid selection";
 +    }
- }
++}