nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-01 20:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22851 from saurabh6790/develop

Browse Source 
fix: validate theme_scss attribute
This commit is contained in:
Rucha Mahabal
2020-07-30 18:30:20 +05:30
committed by GitHub
parent 621529adfb a14618efe4
commit 00175c9621
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/public/js/website_theme.js
View File

@@ -4,8 +4,8 @@
frappe.ui.form.on('Website Theme', {
validate(frm) {
let theme_scss = frm.doc.theme_scss;
if (theme_scss.includes('frappe/public/scss/website')
&& !theme_scss.includes('erpnext/public/scss/website')
if (theme_scss && (theme_scss.includes('frappe/public/scss/website')
&& !theme_scss.includes('erpnext/public/scss/website'))
) {
frm.set_value('theme_scss',
`${frm.doc.theme_scss}\n@import "erpnext/public/scss/website";`);