Administrator
/
smart_service
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

procedure content link changed

master
Ubuntu 2 years ago
parent
d7aa6fd8c5
commit
884d08bcb4
1 changed files with 9 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      smart_service/transactions/doctype/procedure/procedure.js

15
smart_service/transactions/doctype/procedure/procedure.js
View File

@ -63,9 +63,9 @@ frappe.ui.form.on('Procedure', {
var regex = /[://]+/; var regex = /[://]+/;
frappe.db.get_value('Fish', { name: "Fish" }, 'path', (r) => { frappe.db.get_value('Fish', { name: "Fish" }, 'path', (r) => {
for (var i = 0; i < frm.doc.procedure_details.length; i++) { for (var i = 0; i < frm.doc.procedure_details.length; i++) {
if (frm.doc.procedure_details[i].content && r.path && frm.doc.procedure_details[i].content_type == "Link" && !(regex.test(frm.doc.procedure_details[i].content))){ if (frm.doc.procedure_details[i].content && r.path && frm.doc.procedure_details[i].content_type == "Link"){// && !(frm.doc.procedure_details[i].content).includes('</a>')){
var x = "<a href=" + '"' + r.path + "://" + url + "/app/procedure/" + frm.doc.procedure_details[i].content var x = "<a href=" + '"' + r.path + "://" + url + "/app/procedure/" + frm.doc.procedure_details[i].temp_cnt+ '"' + 'target="_blank"' + ' role="link"' +' onclick="window.open('+r.path + "://" + url + "/app/procedure/" + frm.doc.procedure_details[i].temp_cnt+')"'+'>' + frm.doc.procedure_details[i].temp_cnt + '</a>';
frm.doc.procedure_details[i].content = x + '"' + 'target="_blank"' + '>' + frm.doc.procedure_details[i].content + '</a>'; frm.doc.procedure_details[i].content = x
} }
} }
cur_frm.refresh_fields('procedure_details'); cur_frm.refresh_fields('procedure_details');
@ -433,8 +433,11 @@ frappe.ui.form.on('Procedure_Details', {
var url = window.location.host; var url = window.location.host;
var content = values.procedure; var content = values.procedure;
row.doc.system_id = values.variant_mapping + ',' + values.system_id + ',' + values.subsystem_id; row.doc.system_id = values.variant_mapping + ',' + values.system_id + ',' + values.subsystem_id;
// row.doc.content = '<a href="http://' + url + "/app/procedure/" + content + '"' + 'target="_blank"' + '>' + content + '</a>'; // row.doc.content = '<a href="http://' + url + "/app/procedure/" + content + '"' + 'target="_blank"' + '>' + content + '</a>';
row.doc.content = values.procedure + '' if(values.procedure){
row.doc.content = values.procedure + ''
row.doc.temp_cnt = values.procedure + ''
}
d.hide(); d.hide();
// frm.refresh(); // frm.refresh();
cur_frm.refresh_fields('procedure_details'); cur_frm.refresh_fields('procedure_details');
@ -442,7 +445,7 @@ frappe.ui.form.on('Procedure_Details', {
}); });
d.show(); d.show();
} else { } else {
d.content = d.temp_cnt; // d.content = d.temp_cnt;
} }
}, },

Write Preview
Loading…
Cancel
Save