From 7374e1a6b584867d647284704678fc3a20dbd275 Mon Sep 17 00:00:00 2001 From: David Malinowski Date: Mon, 29 Mar 2021 15:19:44 +0200 Subject: [PATCH] Add Password Generator Add CIDR Netmasks --- msp/msp/doctype/ip_network/ip_network.json | 4 ++-- msp/msp/doctype/it_user_account/it_user_account.js | 11 +++++++++++ msp/msp/doctype/it_user_account/it_user_account.py | 8 ++++++++ requirements.txt | 3 ++- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/msp/msp/doctype/ip_network/ip_network.json b/msp/msp/doctype/ip_network/ip_network.json index 64154d6..48839f5 100644 --- a/msp/msp/doctype/ip_network/ip_network.json +++ b/msp/msp/doctype/ip_network/ip_network.json @@ -46,7 +46,7 @@ "fieldtype": "Select", "in_list_view": 1, "label": "CIDR Mask", - "options": "24\n25\n26\n27\n28\n29\n30\n31\n32", + "options": "24\n16\n12\n8\n32\n31\n30\n29\n28\n27\n26\n25\n23\n22\n21\n20\n19\n18\n17\n15\n14\n13\n11\n10\n9\n7\n6\n5\n4\n3\n2\n1", "reqd": 1 }, { @@ -147,7 +147,7 @@ "label": "Aditional Data" } ], - "modified": "2021-03-24 00:12:13.023565", + "modified": "2021-03-29 15:19:10.791248", "modified_by": "Administrator", "module": "MSP", "name": "IP Network", diff --git a/msp/msp/doctype/it_user_account/it_user_account.js b/msp/msp/doctype/it_user_account/it_user_account.js index 98a5578..65450a5 100644 --- a/msp/msp/doctype/it_user_account/it_user_account.js +++ b/msp/msp/doctype/it_user_account/it_user_account.js @@ -4,6 +4,7 @@ frappe.ui.form.on('IT User Account', { refresh: function(frm) { frm.add_custom_button('Copy PW', () => frm.trigger('get_pw')); + frm.add_custom_button('Generate PW', () => frm.trigger('generate_new_pw')); }, get_pw: function(frm) { @@ -15,6 +16,16 @@ frappe.ui.form.on('IT User Account', { frm.events.CopyToClipboard(r.message) } ); + }, + generate_new_pw: function(frm) { + frm.call('generate_new_pw', { + }, + (r) => { + frm.events.CopyToClipboard(r.message); + frm.set_value()("password", r.message); + frm.save() + } + ); }, CopyToClipboard: function(value) { var tempInput = document.createElement("input"); diff --git a/msp/msp/doctype/it_user_account/it_user_account.py b/msp/msp/doctype/it_user_account/it_user_account.py index 28bc24f..d5112c9 100644 --- a/msp/msp/doctype/it_user_account/it_user_account.py +++ b/msp/msp/doctype/it_user_account/it_user_account.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document +from passwordgenerator import pwgenerator class ITUserAccount(Document): @@ -23,3 +24,10 @@ class ITUserAccount(Document): self.save() """ return(self.get_password("password")) + + @frappe.whitelist() + def generate_new_pw(self): + new_password = pwgenerator.generate() + print(new_password) + return(new_password) + diff --git a/requirements.txt b/requirements.txt index 286eaac..7b9a31f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ frappe -ipaddress \ No newline at end of file +ipaddress +passwordgenerator \ No newline at end of file