[ARVADOS] updated: facdb0d52984eed80d42427e43030668a7ab781f

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/helpers/application_helper.rb | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

       via  facdb0d52984eed80d42427e43030668a7ab781f (commit)
      from  d54ace4fb5dd3ce7d010c956d42113811b7b6df1 (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 facdb0d52984eed80d42427e43030668a7ab781f
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Thu Dec 4 15:58:00 2014 -0500

    4525: when dataclass is Class, return attrvalue similar to the Array case.

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index f2cbadd..e003b2c 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -309,17 +309,13 @@ module ApplicationHelper
       end
     end
 
-    if dataclass.andand.is_a?(Class)
-      datatype = 'select'
-    elsif dataclass == 'number'
-      datatype = 'number'
-    elsif attrvalue.is_a? Array
-      # TODO: find a way to edit arrays with x-editable
-      return attrvalue
-    elsif attrvalue.is_a? Fixnum or attrvalue.is_a? Float
+    if dataclass == 'number' or attrvalue.is_a? Fixnum or attrvalue.is_a? Float
       datatype = 'number'
     elsif attrvalue.is_a? String
       datatype = 'text'
+    elsif attrvalue.is_a?(Array) or dataclass.andand.is_a?(Class)
+      # TODO: find a way to edit with x-editable
+      return attrvalue
     end
 
     # When datatype is a String or Fixnum, link_to the attrvalue

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


hooks/post-receive
--