Merge pull request #745 from coral-erm/ERM-111

Fixed logins tab loading issue in usage module
coral-erm · Feb 26, 2024 · b892026 · b892026
2 parents d816876 + 6d288d5
commit b892026
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 27 deletions.
diff --git a/usage/ajax_htmldata.php b/usage/ajax_htmldata.php
@@ -287,7 +287,7 @@
 					$orgArray = $publisherPlatform->getOrganizationExternalLogins();
 					$externalLoginArray = $publisherPlatform->getExternalLogins();
 
-					if ((count($orgArray) > 0) || (count($externalLoginArray) > 0)){
+					if ((is_array($orgArray) && count($orgArray) > 0) || (is_array($externalLoginArray) && count($externalLoginArray) > 0)){
 						$pub = new Publisher(new NamedArguments(array('primaryKey' => $publisherPlatform->publisherID)));
 						$pubArray[$publisherPlatform->publisherID] = $pub->name;
 					}

diff --git a/usage/js/forms/platformNoteSubmitForm.js b/usage/js/forms/platformNoteSubmitForm.js
@@ -17,26 +17,23 @@
 
  $(function(){
 
-
-	 $("#submitPlatformNoteForm").click(function () {
-	 	submitPlatformNotes();
+   $(document).on('click', '#submitPlatformNoteForm', function () {
+     submitPlatformNotes();
 	 });
 
-
-
 	//do submit if enter is hit
-	$('#startYear').keyup(function(e) {
-	      if(e.keyCode == 13) {
-		submitPlatformNotes();
-	      }
+   $(document).on('keyup', '#startYear', function (e) {
+     if(e.keyCode === 13) {
+       submitPlatformNotes();
+     }
 	});
 
 
 	//do submit if enter is hit
-	$('#endYear').keyup(function(e) {
-	      if(e.keyCode == 13) {
-		submitPlatformNotes();
-	      }
+   $(document).on('keyup', '#endYear', function (e) {
+     if(e.keyCode === 13) {
+       submitPlatformNotes();
+     }
 	});
 
 

diff --git a/usage/js/forms/publisherNoteSubmitForm.js b/usage/js/forms/publisherNoteSubmitForm.js
@@ -17,27 +17,26 @@
 
  $(function(){
 
-
-	 $("#submitPublisherNoteForm").click(function () {
-	 	submitPublisherNote();
-	 });
+   $(document).on('click', '#submitPublisherNoteForm', function (e) {
+     submitPublisherNote();
+   });
 
 
 
 	//do submit if enter is hit
-	$('#startYear').keyup(function(e) {
-	      if(e.keyCode == 13) {
-		submitPublisherNote();
-	      }
+   $(document).on('keyup', '#startYear', function (e) {
+     if(e.keyCode === 13) {
+       submitPublisherNote();
+     }
 	});
 
 
 	//do submit if enter is hit
-	$('#endYear').keyup(function(e) {
-	      if(e.keyCode == 13) {
-		submitPublisherNote();
-	      }
-	});
+   $(document).on('keyup', '#endYear', function (e) {
+     if(e.keyCode === 13) {
+       submitPublisherNote();
+     }
+   });