test is green again.

befdata · Aug 13, 2013 · dbf84ab · dbf84ab
1 parent 1a9dd8a
commit dbf84ab
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/controllers/datacolumns_controller.rb b/app/controllers/datacolumns_controller.rb
@@ -216,7 +216,7 @@ def dataset_edit_message
   end
 
   def redirect_if_datagroup_unapproved
-    unless datagroup_id
+    unless @datacolumn.datagroup_id
       flash[:error] = "Please approve the datagroup before approving invalid values"
       redirect_to approve_datagroup_datacolumn_path(@datacolumn)
     end

diff --git a/app/models/dataworkbook.rb b/app/models/dataworkbook.rb
@@ -241,7 +241,7 @@ def add_acknowledged_people(columnheader, data_column_new)
     end
     unless ppl[:unfound_usernames].blank?
       message = "These persons could not be matched within the portal: #{ppl[:unfound_usernames].join(', ')}"
-      data_column_new.informationsource = message
+      data_column_new.update_attribute :informationsource, message
     end
   end
 

diff --git a/app/views/datacolumns/approve_invalid_values.html.haml b/app/views/datacolumns/approve_invalid_values.html.haml
@@ -1,5 +1,5 @@
 %h3 Approve invalid values
-- if @datacolumn.datagroup.present?
+- if @datacolumn.datagroup.blank?
   %p
     Please #{link_to 'Approve the datagroup', approve_datagroup_datacolumn_path(@datacolumn)} first.
 - else

diff --git a/test/unit/dataworkbook_test.rb b/test/unit/dataworkbook_test.rb
@@ -61,7 +61,7 @@ def setup
 
   test 'row in method sheet is recognized correctly' do
     column_info, datagroup_info = @book.parse_method_row('height')
-    assert_equal 11, column_info.keys.length
+    assert_equal 12, column_info.keys.length
     assert_equal 5, datagroup_info.keys.length
 
     assert_equal 'height in m', column_info[:definition]