Merge branch 'master' into 'revert-e1e90a83'

# Conflicts:
#   app/controllers/property_hires_controller.rb

app/assets/javascripts/property_hire_calendar_frontend.js

@@ -153,7 +153,7 @@ var EventDialog = function(calendar,event){
 								   '<h3>' + _event.title + '</h3>' +
 							   '</div>' +
 							   '<div class="modal-body">' +
-								   '<div class="event_summary">' + time_string + '</div>' +
+								   '<div class="event_summary">' + time_string + '<br>' + _event.hiring_person_name + '</div>' 
 								   _event.note +
 							   '</div>' +
 							   '<div class="modal-footer" />' +

app/controllers/property_hires_controller.rb

@@ -69,43 +69,57 @@ class PropertyHiresController < ApplicationController
         "value" => property.note
       }
     end
-    data << {
-      "header" => t("property_hire.property_number"),
-      "value" => property.property_number
-    }
+    if !property.property_number.blank?
+        data << {
+         "header" => t("property_hire.property_number"),
+        "value" => property.property_number
+        }
+    end    
     data << {
       "header" => t("property_hire.can_be_hired"),
       "value" => (property.can_be_hired ? "<span class='label label-success'>Yes</span>" : "<span class='label label-danger'>No</span>")
     }
-    data << {
-      "header" => t("property_hire.purchase_date"),
-      "value" => property.purchase_date.strftime("%Y-%m-%d")
-    }
+    if !property.purchase_date.to_s.blank?
+        data << {
+        "header" => t("property_hire.purchase_date"),
+        "value" => property.purchase_date.strftime("%Y-%m-%d")
+        }
+    end
     if property.owners.empty?
       owners = property.other_owner
     else
       owners = property.owner_profiles.collect{|mp| mp.name}.join(",")
     end
-    data << {
-      "header" => t("property_hire.owners"),
-      "value" => owners
-    }
-    data << {
-      "header" => t("property_hire.owner_email"),
-      "value" => property.owner_email
-    }
-    data << {
-      "header" => t("property_hire.owner_phone"),
-      "value" => property.owner_phone
-    }
-    data << {
-      "header" => t("property_hire.price"),
-      "value" => property.price
-    }
-    data << {
-      "header" => t("property_hire.location"),
-      "value" => property.get_location_name
-    }
+    if !owners.blank?
+        data << {
+         "header" => t("property_hire.owners"),
+         "value" => owners
+        }
+    end
+    if !property.owner_email.blank?
+        data << {
+        "header" => t("property_hire.owner_email"),
+        "value" => property.owner_email
+        }
+    end
+    if !property.owner_phone.blank?
+        data << {
+        "header" => t("property_hire.owner_phone"),
+        "value" => property.owner_phone
+        }
+    end
+    if !property.price.blank?
+        data << {
+         "header" => t("property_hire.price"),
+         "value" => property.price
+        }
+    end
+    if !property.get_location_name.blank?
+        data << {
+        "header" => t("property_hire.location"),
+        "value" => property.get_location_name
+        }
+    end    
     actions = []
     if property.can_be_hired
       actions << {
@@ -211,4 +225,3 @@ end
 
 
 
-

app/models/p_hire.rb

@@ -23,6 +23,8 @@ class PHire
     {
       :id => self.id.to_s,
       :title => self.reason_for_hire,
+      :hiring_person_id => self.hiring_person_id,
+      :hiring_person_name => self.hiring_person_name,
       :note => self.note_for_hire || "",
       :start => self.start_time.rfc822,
       :end => self.end_time.rfc822,