tweaks. related to issue #288

app/controllers/profiles_controller.rb

@@ -14,9 +14,7 @@ def show
   end
 
   def update
-    if @user.update_attributes(params[:user].slice(:login, :password, :password_confirmation, :firstname,
-            :middlenames, :lastname, :email, :salutation, :institution_name, :institution_url, :institution_phone,
-            :institution_fax, :url, :country, :city, :street, :comment, :avatar, :receive_emails))
+    if @user.update_attributes(user_params)
       redirect_to profile_path, :notice => "Saved successfully"
     else
       render :edit
@@ -51,4 +49,11 @@ def votes_history
   def load_current_user
     @user = current_user
   end
+
+  def user_params
+    params[:user].slice(:login, :password, :password_confirmation, :firstname,
+          :middlenames, :lastname, :email, :salutation, :institution_name,
+          :institution_url, :institution_phone, :institution_fax, :url, :country,
+          :city, :street, :comment, :avatar, :receive_emails)
+  end
 end

app/models/datacolumn.rb

@@ -202,9 +202,9 @@ def untouched?
 
   def split_me?
     # This method returns true for a column when it requires splitting.
-    return false if self.approval_stage < 2
+    return false unless datagroup_approved && datatype_approved
     return false if %w{category text}.include? self.import_data_type
-    self.sheetcells.where(["category_id is not null and exists(select 1 from categories AS c where c.datagroup_id = ? and c.id = sheetcells.category_id)", self.datagroup_id]).exists?
+    self.sheetcells.where("category_id is not null").exists?
   end
 
   # users of a datacolumn are those who are responsible for it

app/views/datasets/approval_quick.html.haml

@@ -14,7 +14,7 @@
         %th Datagroup
         %th Datatype
     %tbody
-      -@dataset.datacolumns.each do |c|
+      -@dataset.datacolumns.includes(:datagroup).each do |c|
         = hidden_field_tag "datacolumn[][id]", c.id
         %tr
           %td= c.columnnr