Merge branch '2042-new-collection-from-selected-files'
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 10 Mar 2014 21:08:46 +0000 (17:08 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 10 Mar 2014 21:08:46 +0000 (17:08 -0400)
1  2 
apps/workbench/app/assets/javascripts/editable.js
apps/workbench/app/assets/javascripts/selection.js
apps/workbench/app/assets/stylesheets/application.css.scss
apps/workbench/app/controllers/pipeline_instances_controller.rb
apps/workbench/config/routes.rb

index adb49d7c15b6628d56729821e618ef534f1b18ba,79bad15e774cf9b2b19bb034bf0bfdc34e005cac..e37b9444c1615bfd10ce760fa3934f0ab7e76c0d
@@@ -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";
 +    }
++}
Simple merge