projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a2107d5
26114a8
)
Merge branch '2042-new-collection-from-selected-files'
author
Peter Amstutz <peter.amstutz@curoverse.com>
Mon, 10 Mar 2014 21:08:46 +0000
(17:08 -0400)
committer
Peter 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
patch
|
diff1
|
diff2
|
blob
|
history
apps/workbench/app/assets/javascripts/selection.js
patch
|
diff1
|
diff2
|
blob
|
history
apps/workbench/app/assets/stylesheets/application.css.scss
patch
|
diff1
|
diff2
|
blob
|
history
apps/workbench/app/controllers/pipeline_instances_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
apps/workbench/config/routes.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/assets/javascripts/editable.js
index adb49d7c15b6628d56729821e618ef534f1b18ba,79bad15e774cf9b2b19bb034bf0bfdc34e005cac..e37b9444c1615bfd10ce760fa3934f0ab7e76c0d
---
1
/
apps/workbench/app/assets/javascripts/editable.js
---
2
/
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";
+ }
++}
diff --cc
apps/workbench/app/assets/javascripts/selection.js
Simple merge
diff --cc
apps/workbench/app/assets/stylesheets/application.css.scss
Simple merge
diff --cc
apps/workbench/app/controllers/pipeline_instances_controller.rb
Simple merge
diff --cc
apps/workbench/config/routes.rb
Simple merge