Skip to content

Commit

Permalink
Merge pull request #744 from coral-erm/ERM-108
Browse files Browse the repository at this point in the history
Fixed bugs when reporting an issue
  • Loading branch information
andyp-uk authored Feb 26, 2024
2 parents af90a78 + 591e318 commit d816876
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion organizations/js/orgDetail.js
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@

});

$(".issuesBtn").click(function(e) {
$(document).on('click' , '.issuesBtn', function(e) {
e.preventDefault();
getResourceIssues($(this));
});
Expand Down
18 changes: 9 additions & 9 deletions resources/js/resource.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ $(document).ready(function(){
$('.resource_tab_content').hide();
$('#div_orders').show();
$('#div_fullRightPanel').show();
updateOrders();
updateOrders();
return false;
});

Expand Down Expand Up @@ -97,17 +97,17 @@ $(document).ready(function(){
updateCataloging();
return false;
});


$("#resourceAcquisitionSelect").change(function () {
var newLoc = location.search;
if (newLoc.includes('resourceAcquisitionID')) {
newLoc = newLoc.replace(/resourceAcquisitionID=[^&$]*/i, 'resourceAcquisitionID=' + $(this).val());
} else {
newLoc += "&resourceAcquisitionID=" + $(this).val();
newLoc += "&resourceAcquisitionID=" + $(this).val();
}
if (newLoc.includes('showTab')) {
newLoc = newLoc.replace(/showTab=[^&$]*/i, 'showTab=' + currentTab);
newLoc = newLoc.replace(/showTab=[^&$]*/i, 'showTab=' + currentTab);
} else {
newLoc += "&showTab=" + currentTab;
}
Expand All @@ -121,12 +121,12 @@ $(document).ready(function(){
updateAttachmentsNumber();


$(".issuesBtn").on("click", function(e) {
$(document).on('click' , '.issuesBtn', function(e) {
e.preventDefault();
getIssues($(this));
});

$(".downtimeBtn").on("click", function(e) {
$(document).on('click', '.downtimeBtn', function (e) {
e.preventDefault();
getDowntime($(this));
});
Expand Down Expand Up @@ -220,7 +220,7 @@ $(document).ready(function(){
});
});

$("#createContact").on("click",function(e) {
$(document).on('click', '#createContact', function (e) {
e.preventDefault();

var errors = [];
Expand Down Expand Up @@ -293,7 +293,7 @@ $(document).ready(function(){
$(this).hide();
});


$(function(){
$('.date-pick').datePicker({startDate:'01/01/1996'});
});
Expand Down Expand Up @@ -487,7 +487,7 @@ function getInlineContactForm() {
}

function updateIssues(){
currentTab = "Issues";
currentTab = "Issues";
$.ajax({
type: "GET",
url: "ajax_htmldata.php",
Expand Down

0 comments on commit d816876

Please sign in to comment.