diff --git a/Site/Master-v5.master b/Site/Master-v5.master index ac0b547f..62486d51 100644 --- a/Site/Master-v5.master +++ b/Site/Master-v5.master @@ -221,7 +221,7 @@
-
+

PERSONNAME: Account

​
@@ -348,8 +348,12 @@ $('span.spanModalEditingPersonName').text(SwarmopsJS.unescape('<%= this.Localized_LoadingPlaceholderShort %>')); + // Open the Modal <%=this.ModalMasterEditPerson.ClientID%>_open(); + // Switch to first tab (another tab may have been open while editing earlier) + $('#imgFirstTabMasterEditPerson').click(); // what the actual fuck, easyui, why isn't there a tab change method? + var personEditorData = { personId: parseInt(personId) // parseInt to force passing integer over JSON }; @@ -386,6 +390,10 @@ // Do the AJAX call from here, as we need to also pass along the person ID of the person edited // (the AjaxTextBox auto-callback is disabled for this reason, code duplicated here) + if (_master_PersonEditLoading) { + return; // defensive coding + } + var jsonData = { personId: _master_PersonEditedId, field: fieldName, @@ -412,7 +420,7 @@ } function masterEndEditPerson() { - alert("EndEditPerson"); + _master_PersonEditedId = -1; // no person being edited anymore }