Donor upload lastname fixed

app/controllers/donors_controller.rb

@@ -115,6 +115,13 @@ def upload_validate_donor
       cur_donor.title = row[1]
       cur_donor.first_name = row[2]
 
+      # Last Name formatting
+      if row[3].blank?
+        cur_donor.last_name = "."
+      else
+        cur_donor.last_name = row[3]
+      end
+
       # Gender format changes
       if ((row[4] == "B") || (row[4] == "Boy") || (row[4] == "M") || (row[4] == "Male"))
         cur_donor.gender = "Boy"
@@ -133,13 +140,11 @@ def upload_validate_donor
       cur_donor.state = row[11]
       cur_donor.country = row[12]
       cur_donor.pincode = row[13]
-      cur_donor.phone = row[14]
-      cur_donor.mobile = row[15]
+      cur_donor.phone = row[14].to_s
+      cur_donor.mobile = row[15].to_s.to_s
       cur_donor.donor_type = row[16]
       cur_donor.comment = row[17]
 
-      cur_donor.last_name = "."
-
       if cur_donor.valid?
         @donors << cur_donor
         # Save the data to DB on success validation for each entry

app/views/donors/show.html.erb

@@ -1,9 +1,11 @@
 <p id="notice"><%= notice %></p>
 
 <h1>
-SHOWING DONOR INFORMATION FOR
+SHOWING DONOR:
 <%= @donor.first_name %> <%= @donor.last_name %>
+<% if (user_signed_in?) && (current_user.role == "super_admin") %>
 ID: <%= @donor.id %>
+<% end %>
 </h1>
 <h3 id="alert">NOTE: You cannot change any Profile information here. However, you can DONATE newly</h3>
 

config/initializers/devise.rb

@@ -112,7 +112,7 @@
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this
   # time the user will be asked for credentials again. Default is 30 minutes.
-  config.timeout_in = 5.minutes
+  config.timeout_in = 30.minutes
 
   # ==> Configuration for :lockable
   # Defines which strategy will be used to lock an account.
@@ -208,3 +208,4 @@
   #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
   # end
 end
+