From 32e49731bece8cc7858856169592455bdd0024ec Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 27 May 2022 09:18:15 +0000 Subject: [PATCH] double extension,url path for procedure link --- smart_service/overrides/overrides/override_file.py | 12 +++++++----- smart_service/transactions/doctype/fish/fish.json | 11 +++++++++-- .../transactions/doctype/procedure/procedure.js | 11 +++++++++++ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/smart_service/overrides/overrides/override_file.py b/smart_service/overrides/overrides/override_file.py index 22495c8..b730bb6 100644 --- a/smart_service/overrides/overrides/override_file.py +++ b/smart_service/overrides/overrides/override_file.py @@ -3,8 +3,10 @@ import frappe, json import json from frappe.utils import cstr, flt, cint def validate(doc=None,method=None): - f = doc.file_name - file_split = f.split('.') - file_length = len(file_split) - if file_length > 2: - frappe.throw("Double Extension file not allowed") \ No newline at end of file + data = ['.jpg', '.png','.mp4', '.docx','.xls', '.pdf','.tiff','.ppt','.m4v','.doc','.pps','.pptx'] + file_name = doc.file_name + total_count = 0 + for i in data: + total_count += file_name.count(i) + if total_count > 1: + frappe.throw('Double Extension file not allowed') \ No newline at end of file diff --git a/smart_service/transactions/doctype/fish/fish.json b/smart_service/transactions/doctype/fish/fish.json index a53ab87..b90239a 100644 --- a/smart_service/transactions/doctype/fish/fish.json +++ b/smart_service/transactions/doctype/fish/fish.json @@ -6,19 +6,26 @@ "editable_grid": 1, "engine": "InnoDB", "field_order": [ - "apple" + "apple", + "path" ], "fields": [ { "fieldname": "apple", "fieldtype": "Data", "label": "Apple" + }, + { + "fieldname": "path", + "fieldtype": "Select", + "label": "Path", + "options": "https\nhttp" } ], "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2022-02-12 13:41:59.230075", + "modified": "2022-05-27 13:46:42.150311", "modified_by": "Administrator", "module": "Transactions", "name": "Fish", diff --git a/smart_service/transactions/doctype/procedure/procedure.js b/smart_service/transactions/doctype/procedure/procedure.js index 6ccceed..f5607de 100644 --- a/smart_service/transactions/doctype/procedure/procedure.js +++ b/smart_service/transactions/doctype/procedure/procedure.js @@ -18,6 +18,17 @@ cur_frm.fields_dict['procedure_details'].grid.get_field('step_name').get_query = frappe.ui.form.on('Procedure', { onload: function (frm) { + if(frm.doc.procedure_details){ + var url = window.location.host; + frappe.db.get_value('Fish', {name: "Fish"}, 'path' , (r) =>{ + for (var i=0;i' + frm.doc.procedure_details[i].content + ''; + } + } + }) + } if (frm.doc.workflow_state == 'Publish Ready'){ frm.set_read_only(); }