diff --git a/Logic/Support/DatabaseMaintenance.cs b/Logic/Support/DatabaseMaintenance.cs index 311ef348..d11bda78 100644 --- a/Logic/Support/DatabaseMaintenance.cs +++ b/Logic/Support/DatabaseMaintenance.cs @@ -85,7 +85,7 @@ namespace Swarmops.Logic.Support sql = client.DownloadString (fileName); } } - catch (Exception) + catch (Exception outerException) { Console.WriteLine(" trying fallback..."); @@ -99,9 +99,19 @@ namespace Swarmops.Logic.Support sql = client.DownloadString(fileName); } } - catch (Exception) + catch (Exception middleException) { - OutboundComm.CreateNotification(null, NotificationResource.System_DatabaseUpgradeFailed); + try + { + OutboundComm.CreateNotification (null, NotificationResource.System_DatabaseUpgradeFailed); + } + catch (ArgumentException) + { + // if this happens during setup: + + throw new Exception ("Failed fetching upgrade packages:\r\n" + middleException.ToString() + + "\r\n" + outerException.ToString()); + } Console.WriteLine(" FAILED! Aborting."); return; diff --git a/Site5/Master-v5.master b/Site5/Master-v5.master index 456896bb..252b9380 100644 --- a/Site5/Master-v5.master +++ b/Site5/Master-v5.master @@ -351,7 +351,7 @@ <%=this.ModalMasterEditPerson.ClientID%>_open(); var personEditorData = { - personId: personId + personId: parseInt(personId) // parseInt to force passing integer over JSON }; _master_PersonEditLoading = false; diff --git a/Site5/Style/style-v5.css b/Site5/Style/style-v5.css index 685217ce..8b06dc8a 100644 --- a/Site5/Style/style-v5.css +++ b/Site5/Style/style-v5.css @@ -736,11 +736,11 @@ body.rtl .entryLabelsAdmin { -webkit-border-radius: 2px; border-radius: 2px; line-height: 30px; - float:left; + float:right; padding-top: 5px; padding-bottom: 5px; - padding-left: 10px; - padding-right: 10px; + padding-left: 5px; + padding-right: 5px; margin-top: 5px; margin-bottom: 5px;