{{ frappe.utils.encode_tags(j.job_name) }}
diff --git a/frappe/core/page/background_jobs/background_jobs.py b/frappe/core/page/background_jobs/background_jobs.py
index 10cb7b97ac..c8a2352968 100644
--- a/frappe/core/page/background_jobs/background_jobs.py
+++ b/frappe/core/page/background_jobs/background_jobs.py
@@ -29,9 +29,9 @@ def get_info(show_failed=False):
jobs.append({
'job_name': j.kwargs.get('kwargs', {}).get('playbook_method') \
or str(j.kwargs.get('job_name')),
- 'status': j.status, 'queue': name,
+ 'status': j.get_status(), 'queue': name,
'creation': format_datetime(convert_utc_to_user_timezone(j.created_at)),
- 'color': colors[j.status]
+ 'color': colors[j.get_status()]
})
if j.exc_info:
jobs[-1]['exc_info'] = j.exc_info
diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py
index ebe8ce2c16..1f4eaee783 100644
--- a/frappe/core/page/dashboard/dashboard.py
+++ b/frappe/core/page/dashboard/dashboard.py
@@ -36,13 +36,15 @@ def generate_and_cache_results(chart, chart_name, function, cache_key):
def get_from_date_from_timespan(to_date, timespan):
days = months = years = 0
- if "Last Week" == timespan:
+ if timespan == "Last Week":
days = -7
- if "Last Month" == timespan:
+ if timespan == "Last Month":
months = -1
- elif "Last Quarter" == timespan:
+ elif timespan == "Last Quarter":
months = -3
- elif "Last Year" == timespan:
+ elif timespan == "Last Year":
years = -1
+ elif timespan == "All Time":
+ years = -50
return add_to_date(to_date, years=years, months=months, days=days,
as_datetime=True)
diff --git a/frappe/database/database.py b/frappe/database/database.py
index f5055571ff..1c08dd714e 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -15,7 +15,7 @@ import frappe.model.meta
from frappe import _
from time import time
-from frappe.utils import now, getdate, cast_fieldtype
+from frappe.utils import now, getdate, cast_fieldtype, get_datetime
from frappe.utils.background_jobs import execute_job, get_queue
from frappe.model.utils.link_count import flush_local_link_count
from frappe.utils import cint
@@ -941,6 +941,16 @@ class Database(object):
else:
frappe.throw(_('No conditions provided'))
+ def get_last_created(self, doctype):
+ last_record = self.get_all(doctype, ('creation'), limit=1, order_by='creation desc')
+ if last_record:
+ return get_datetime(last_record[0].creation)
+ else:
+ return None
+
+ def clear_table(self, doctype):
+ self.sql('truncate `tab{}`'.format(doctype))
+
def log_touched_tables(self, query, values=None):
if values:
query = frappe.safe_decode(self._cursor.mogrify(query, values))
diff --git a/frappe/database/db_manager.py b/frappe/database/db_manager.py
index 0447f97273..80236b2dc2 100644
--- a/frappe/database/db_manager.py
+++ b/frappe/database/db_manager.py
@@ -80,12 +80,14 @@ class DbManager:
if pipe:
print('Creating Database...')
- command = '{pipe} mysql -u {user} -p{password} -h{host} {target} {source}'.format(
+ command = '{pipe} mysql -u {user} -p{password} -h{host} ' + ('-P{port}' if frappe.db.port else '') + ' {target} {source}'
+ command = command.format(
pipe=pipe,
user=esc(user),
password=esc(password),
host=esc(frappe.db.host),
target=esc(target),
- source=source
+ source=source,
+ port=frappe.db.port
)
os.system(command)
diff --git a/frappe/database/mariadb/framework_mariadb.sql b/frappe/database/mariadb/framework_mariadb.sql
index 7058ed0325..b1a769b189 100644
--- a/frappe/database/mariadb/framework_mariadb.sql
+++ b/frappe/database/mariadb/framework_mariadb.sql
@@ -105,6 +105,53 @@ CREATE TABLE `tabDocPerm` (
KEY `parent` (`parent`)
) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+--
+-- Table structure for table `tabDocType Action`
+--
+
+CREATE TABLE `tabDocType Action` (
+ `name` varchar(140) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `creation` datetime(6) DEFAULT NULL,
+ `modified` datetime(6) DEFAULT NULL,
+ `modified_by` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `owner` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `docstatus` int(1) NOT NULL DEFAULT 0,
+ `parent` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `parentfield` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `parenttype` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `idx` int(8) NOT NULL DEFAULT 0,
+ `label` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `group` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `action_type` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `action` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`name`),
+ KEY `parent` (`parent`),
+ KEY `modified` (`modified`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED;
+
+--
+-- Table structure for table `tabDocType Action`
+--
+
+CREATE TABLE `tabDocType Link` (
+ `name` varchar(140) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `creation` datetime(6) DEFAULT NULL,
+ `modified` datetime(6) DEFAULT NULL,
+ `modified_by` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `owner` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `docstatus` int(1) NOT NULL DEFAULT 0,
+ `parent` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `parentfield` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `parenttype` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `idx` int(8) NOT NULL DEFAULT 0,
+ `group` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `link_doctype` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `link_fieldname` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`name`),
+ KEY `parent` (`parent`),
+ KEY `modified` (`modified`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED;
+
--
-- Table structure for table `tabDocType`
--
diff --git a/frappe/database/postgres/framework_postgres.sql b/frappe/database/postgres/framework_postgres.sql
index df59de92df..cd2f02d8e4 100644
--- a/frappe/database/postgres/framework_postgres.sql
+++ b/frappe/database/postgres/framework_postgres.sql
@@ -106,6 +106,57 @@ CREATE TABLE "tabDocPerm" (
create index on "tabDocPerm" ("parent");
+--
+-- Table structure for table "tabDocType Action"
+--
+
+DROP TABLE IF EXISTS "tabDocType Action";
+CREATE TABLE "tabDocType Action" (
+ "name" varchar(255) NOT NULL,
+ "creation" timestamp(6) DEFAULT NULL,
+ "modified" timestamp(6) DEFAULT NULL,
+ "modified_by" varchar(255) DEFAULT NULL,
+ "owner" varchar(255) DEFAULT NULL,
+ "docstatus" smallint NOT NULL DEFAULT 0,
+ "parent" varchar(255) DEFAULT NULL,
+ "parentfield" varchar(255) DEFAULT NULL,
+ "parenttype" varchar(255) DEFAULT NULL,
+ "idx" bigint NOT NULL DEFAULT 0,
+ "label" varchar(140) NOT NULL,
+ "group" varchar(140) DEFAULT NULL,
+ "action_type" varchar(140) NOT NULL,
+ "action" varchar(140) NOT NULL,
+ PRIMARY KEY ("name")
+) ;
+
+create index on "tabDocType Action" ("parent");
+
+--
+-- Table structure for table "tabDocType Link"
+--
+
+DROP TABLE IF EXISTS "tabDocType Link";
+CREATE TABLE "tabDocType Link" (
+ "name" varchar(255) NOT NULL,
+ "creation" timestamp(6) DEFAULT NULL,
+ "modified" timestamp(6) DEFAULT NULL,
+ "modified_by" varchar(255) DEFAULT NULL,
+ "owner" varchar(255) DEFAULT NULL,
+ "docstatus" smallint NOT NULL DEFAULT 0,
+ "parent" varchar(255) DEFAULT NULL,
+ "parentfield" varchar(255) DEFAULT NULL,
+ "parenttype" varchar(255) DEFAULT NULL,
+ "idx" bigint NOT NULL DEFAULT 0,
+ "label" varchar(140) DEFAULT NULL,
+ "group" varchar(140) DEFAULT NULL,
+ "link_doctype" varchar(140) NOT NULL,
+ "link_fieldname" varchar(140) NOT NULL,
+ PRIMARY KEY ("name")
+) ;
+
+create index on "tabDocType Link" ("parent");
+
+
--
-- Table structure for table "tabDocType"
--
diff --git a/frappe/desk/doctype/bulk_update/bulk_update.js b/frappe/desk/doctype/bulk_update/bulk_update.js
index 6f2a9c3dde..bb9cf2af51 100644
--- a/frappe/desk/doctype/bulk_update/bulk_update.js
+++ b/frappe/desk/doctype/bulk_update/bulk_update.js
@@ -3,6 +3,15 @@
frappe.ui.form.on('Bulk Update', {
refresh: function(frm) {
+ frm.set_query("document_type", function() {
+ return {
+ filters: [
+ ['DocType', 'issingle', '=', 0],
+ ['DocType', 'name', 'not in', frappe.model.core_doctypes_list]
+ ]
+ };
+ });
+
frm.page.set_primary_action(__('Update'), function() {
if (!frm.doc.update_value) {
frappe.throw(__('Field "value" is mandatory. Please specify value to be updated'));
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 99ba49bc4f..a330f7e97e 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -41,6 +41,7 @@ frappe.ui.form.on('Dashboard Chart', {
timespan: function(frm) {
const time_interval_options = {
"Select Date Range": ["Quarterly", "Monthly", "Weekly", "Daily"],
+ "All Time": ["Yearly", "Monthly"],
"Last Year": ["Quarterly", "Monthly", "Weekly", "Daily"],
"Last Quarter": ["Monthly", "Weekly", "Daily"],
"Last Month": ["Weekly", "Daily"],
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 7e99b86eae..a5f9cead00 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -82,14 +82,14 @@
"fieldname": "timespan",
"fieldtype": "Select",
"label": "Timespan",
- "options": "Last Year\nLast Quarter\nLast Month\nLast Week\nSelect Date Range"
+ "options": "All Time\nLast Year\nLast Quarter\nLast Month\nLast Week\nSelect Date Range"
},
{
"depends_on": "timeseries",
"fieldname": "time_interval",
"fieldtype": "Select",
"label": "Time Interval",
- "options": "Quarterly\nMonthly\nWeekly\nDaily"
+ "options": "Yearly\nQuarterly\nMonthly\nWeekly\nDaily"
},
{
"default": "0",
@@ -187,7 +187,7 @@
"label": "To Date"
}
],
- "modified": "2019-11-04 12:32:14.525409",
+ "modified": "2019-11-18 16:20:11.529496",
"modified_by": "Administrator",
"module": "Desk",
"name": "Dashboard Chart",
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index e7ec3f8bab..6dec12efc5 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -74,8 +74,7 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date):
result = convert_to_dates(data, timegrain)
# add missing data points for periods where there was no result
- result = add_missing_values(result, timegrain, from_date, to_date)
-
+ result = add_missing_values(result, timegrain, timespan, from_date, to_date)
chart_config = {
"labels": [formatdate(r[0].strftime('%Y-%m-%d')) for r in result],
"datasets": [{
@@ -133,7 +132,9 @@ def get_aggregate_function(chart_type):
"Average": "AVG",
}[chart_type]
+
def convert_to_dates(data, timegrain):
+ """ Converts individual dates within data to the end of period """
result = []
for d in data:
if timegrain == 'Daily':
@@ -141,10 +142,11 @@ def convert_to_dates(data, timegrain):
elif timegrain == 'Weekly':
result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), weeks = d[1] + 1), days = -1), d[2]])
elif timegrain == 'Monthly':
- result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months = d[1]), days = -1), d[2]])
+ result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months=d[1]), days = -1), d[2]])
elif timegrain == 'Quarterly':
- result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months = d[1] * 3), days = -1), d[2]])
-
+ result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months=d[1] * 3), days = -1), d[2]])
+ elif timegrain == 'Yearly':
+ result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months=12), days = -1), d[2]])
result[-1][0] = getdate(result[-1][0])
return result
@@ -164,17 +166,17 @@ def get_unit_function(datefield, timegrain):
return unit_function
-def add_missing_values(data, timegrain, from_date, to_date):
+def add_missing_values(data, timegrain, timespan, from_date, to_date):
# add missing intervals
result = []
- first_expected_date = get_period_ending(from_date, timegrain)
-
- # fill out data before the first data point
- first_data_point_date = data[0][0] if data else getdate(add_to_date(to_date, days=1))
- while first_data_point_date > first_expected_date:
- result.append([first_expected_date, 0.0])
- first_expected_date = get_next_expected_date(first_expected_date, timegrain)
+ if timespan != 'All Time':
+ first_expected_date = get_period_ending(from_date, timegrain)
+ # fill out data before the first data point
+ first_data_point_date = data[0][0] if data else getdate(add_to_date(to_date, days=1))
+ while first_data_point_date > first_expected_date:
+ result.append([first_expected_date, 0.0])
+ first_expected_date = get_next_expected_date(first_expected_date, timegrain)
# fill data points and missing points
for i, d in enumerate(data):
@@ -212,14 +214,16 @@ def get_next_expected_date(date, timegrain):
def get_period_ending(date, timegrain):
date = getdate(date)
- if timegrain=='Daily':
+ if timegrain == 'Daily':
pass
- elif timegrain=='Weekly':
+ elif timegrain == 'Weekly':
date = get_week_ending(date)
- elif timegrain=='Monthly':
+ elif timegrain == 'Monthly':
date = get_month_ending(date)
- elif timegrain=='Quarterly':
+ elif timegrain == 'Quarterly':
date = get_quarter_ending(date)
+ elif timegrain == 'Yearly':
+ date = get_year_ending(date)
return getdate(date)
@@ -231,7 +235,7 @@ def get_week_ending(date):
# first day of next week
date = add_to_date('{}-01-01'.format(date.year), weeks = week_of_the_year + 1)
# last day of this week
- return add_to_date(date, days = -1)
+ return add_to_date(date, days=-1)
def get_month_ending(date):
month_of_the_year = int(date.strftime('%m'))
@@ -239,7 +243,7 @@ def get_month_ending(date):
date = add_to_date('{}-01-01'.format(date.year), months = month_of_the_year)
# last day of this month
- return add_to_date(date, days = -1)
+ return add_to_date(date, days=-1)
def get_quarter_ending(date):
date = getdate(date)
@@ -255,8 +259,17 @@ def get_quarter_ending(date):
return date
+def get_year_ending(date):
+ ''' returns year ending of the given date '''
+
+ # first day of next year (note year starts from 1)
+ date = add_to_date('{}-01-01'.format(date.year), months = 12)
+ # last day of this month
+ return add_to_date(date, days=-1)
+
class DashboardChart(Document):
+
def on_update(self):
frappe.cache().delete_key('chart-data:{}'.format(self.name))
diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
index fc74448d10..238d4f28e5 100644
--- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
@@ -36,6 +36,9 @@ class TestDashboardChart(unittest.TestCase):
self.assertEqual(get_period_ending('2019-10-01', 'Quarterly'),
getdate('2019-12-31'))
+ self.assertEqual(get_period_ending('2019-10-01', 'Yearly'),
+ getdate('2019-12-31'))
+
def test_dashboard_chart(self):
if frappe.db.exists('Dashboard Chart', 'Test Dashboard Chart'):
frappe.delete_doc('Dashboard Chart', 'Test Dashboard Chart')
diff --git a/frappe/desk/doctype/global_search_settings/global_search_settings.py b/frappe/desk/doctype/global_search_settings/global_search_settings.py
index 0729fca5cb..85c9687ab3 100644
--- a/frappe/desk/doctype/global_search_settings/global_search_settings.py
+++ b/frappe/desk/doctype/global_search_settings/global_search_settings.py
@@ -29,12 +29,16 @@ class GlobalSearchSettings(Document):
repeated_dts = (", ".join([frappe.bold(dt) for dt in repeated_dts]))
frappe.throw(_("Document Type {0} has been repeated.").format(repeated_dts))
-def get_doctypes_for_global_search():
- doctypes = frappe.get_list("Global Search DocType", fields=["document_type"], order_by="idx ASC")
- if not doctypes:
- return []
+ # reset cache
+ frappe.cache().hdel('global_search', 'search_priorities')
+
+def get_doctypes_for_global_search():
+ def get_from_db():
+ doctypes = frappe.get_list("Global Search DocType", fields=["document_type"], order_by="idx ASC")
+ return [d.document_type for d in doctypes] or []
+
+ return frappe.cache().hget("global_search", "search_priorities", get_from_db)
- return [d.document_type for d in doctypes]
@frappe.whitelist()
def reset_global_search_settings_doctypes():
@@ -57,7 +61,7 @@ def update_global_search_doctypes():
if search_doctypes.get(domain):
global_search_doctypes.extend(search_doctypes.get(domain))
- doctype_list = set([dt.name for dt in frappe.get_list("DocType")])
+ doctype_list = set([dt.name for dt in frappe.get_all("DocType")])
allowed_in_global_search = []
for dt in global_search_doctypes:
diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py
index 87bfc1ca17..398a3de351 100644
--- a/frappe/desk/doctype/notification_log/notification_log.py
+++ b/frappe/desk/doctype/notification_log/notification_log.py
@@ -42,7 +42,6 @@ def enqueue_create_notification(users, doc):
This breaks new site creation if Redis server is not running.
We do not need any notifications in fresh installation
'''
-
if frappe.flags.in_install:
return
diff --git a/frappe/desk/doctype/notification_settings/notification_settings.js b/frappe/desk/doctype/notification_settings/notification_settings.js
new file mode 100644
index 0000000000..d4e3b08def
--- /dev/null
+++ b/frappe/desk/doctype/notification_settings/notification_settings.js
@@ -0,0 +1,12 @@
+// Copyright (c) 2019, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Notification Settings', {
+ onload: () => {
+ frappe.breadcrumbs.add({
+ label: __('Settings'),
+ route: '#modules/Settings',
+ type: 'Custom'
+ });
+ }
+});
diff --git a/frappe/desk/doctype/onboarding_slide/__init__.py b/frappe/desk/doctype/onboarding_slide/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/desk/doctype/onboarding_slide/onboarding_slide.js b/frappe/desk/doctype/onboarding_slide/onboarding_slide.js
new file mode 100644
index 0000000000..dc91f42913
--- /dev/null
+++ b/frappe/desk/doctype/onboarding_slide/onboarding_slide.js
@@ -0,0 +1,45 @@
+// Copyright (c) 2019, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Onboarding Slide', {
+ refresh: function(frm) {
+ frm.toggle_reqd('ref_doctype', (frm.doc.slide_type=='Create' || frm.doc.slide_type=='Settings'));
+ frm.toggle_reqd('slide_module', (frm.doc.slide_type=='Information' || frm.doc.slide_type=='Continue'));
+ },
+
+ ref_doctype: function(frm) {
+ frm.set_query('ref_doctype', function() {
+ if (frm.doc.slide_type === 'Create') {
+ return {
+ filters: {
+ 'issingle': 0,
+ 'istable': 0
+ }
+ };
+ } else if (frm.doc.slide_type === 'Settings') {
+ return {
+ filters: {
+ 'issingle': 1,
+ 'istable': 0
+ }
+ };
+ }
+ });
+
+ //fetch mandatory fields automatically
+ if (frm.doc.ref_doctype) {
+ frappe.model.clear_table(frm.doc, 'slide_fields');
+ let fields = frappe.meta.get_docfields(frm.doc.ref_doctype, null, {
+ reqd: 1
+ });
+ $.each(fields, function(_i, data) {
+ let row = frappe.model.add_child(frm.doc, 'Onboarding Slide', 'slide_fields');
+ row.label = data.label;
+ row.fieldtype = data.fieldtype;
+ row.fieldname = data.fieldname;
+ row.options = data.options;
+ });
+ refresh_field('slide_fields');
+ }
+ }
+});
diff --git a/frappe/desk/doctype/onboarding_slide/onboarding_slide.json b/frappe/desk/doctype/onboarding_slide/onboarding_slide.json
new file mode 100644
index 0000000000..3f6f0d719f
--- /dev/null
+++ b/frappe/desk/doctype/onboarding_slide/onboarding_slide.json
@@ -0,0 +1,184 @@
+{
+ "autoname": "field:slide_title",
+ "creation": "2019-11-13 14:39:56.834658",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "slide_title",
+ "app",
+ "slide_order",
+ "column_break_4",
+ "image_src",
+ "slide_module",
+ "description_section_break",
+ "slide_desc",
+ "action_section_break",
+ "slide_type",
+ "column_break_6",
+ "max_count",
+ "add_more_button",
+ "section_break_18",
+ "ref_doctype",
+ "slide_fields",
+ "section_break_10",
+ "domains",
+ "column_break_12",
+ "help_links",
+ "is_completed"
+ ],
+ "fields": [
+ {
+ "fieldname": "slide_title",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Slide Title",
+ "reqd": 1,
+ "unique": 1
+ },
+ {
+ "fieldname": "slide_desc",
+ "fieldtype": "HTML Editor",
+ "label": "Slide Description"
+ },
+ {
+ "default": "3",
+ "depends_on": "add_more_button",
+ "description": "The amount of times you want to repeat the set of fields (eg: if you want 3 customers in the slide, set this field to 3. Only the first set of fields is shown as mandatory in the slide)",
+ "fieldname": "max_count",
+ "fieldtype": "Int",
+ "label": "Max Count"
+ },
+ {
+ "default": "0",
+ "depends_on": "eval:doc.slide_type=='Create' || doc.slide_type=='Settings'",
+ "fieldname": "add_more_button",
+ "fieldtype": "Check",
+ "label": "Add More Button"
+ },
+ {
+ "depends_on": "eval:doc.slide_type=='Create' || doc.slide_type=='Settings'",
+ "fieldname": "slide_fields",
+ "fieldtype": "Table",
+ "label": "Slide Fields",
+ "options": "Onboarding Slide Field"
+ },
+ {
+ "fieldname": "section_break_10",
+ "fieldtype": "Section Break"
+ },
+ {
+ "description": "Specify in what all domains should the slides show up. If nothing is specified the slide is shown in all domains by default.",
+ "fieldname": "domains",
+ "fieldtype": "Table",
+ "label": "Domains",
+ "options": "Has Domain"
+ },
+ {
+ "fieldname": "column_break_12",
+ "fieldtype": "Column Break"
+ },
+ {
+ "description": "Add a help video link just in case user has no idea about what to fill in the slide.",
+ "fieldname": "help_links",
+ "fieldtype": "Table",
+ "label": "Help Links",
+ "options": "Onboarding Slide Help Link"
+ },
+ {
+ "fieldname": "action_section_break",
+ "fieldtype": "Section Break",
+ "label": "Action Settings"
+ },
+ {
+ "description": "If Slide Type is Create or Settings there should be a 'create_onboarding_docs' method in the {ref_doctype}.py file bound to be executed after the slide is completed.",
+ "fieldname": "slide_type",
+ "fieldtype": "Select",
+ "label": "Slide Type",
+ "options": "Information\nCreate\nSettings\nContinue",
+ "reqd": 1
+ },
+ {
+ "fieldname": "column_break_6",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "app",
+ "fieldtype": "Select",
+ "label": "App",
+ "options": "Frappe\nERPNext",
+ "reqd": 1
+ },
+ {
+ "fieldname": "column_break_4",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "image_src",
+ "fieldtype": "Data",
+ "label": "Slide Image Source"
+ },
+ {
+ "fieldname": "description_section_break",
+ "fieldtype": "Section Break",
+ "label": "Description"
+ },
+ {
+ "depends_on": "eval:doc.slide_type=='Create' || doc.slide_type=='Settings'",
+ "fieldname": "ref_doctype",
+ "fieldtype": "Link",
+ "label": "Reference Document Type",
+ "options": "DocType"
+ },
+ {
+ "default": "0",
+ "description": "Determines the order of the slide in the wizard. If the slide is not to be displayed, priority should be set to 0.",
+ "fieldname": "slide_order",
+ "fieldtype": "Int",
+ "label": "Slide Order"
+ },
+ {
+ "depends_on": "eval:doc.slide_type=='Information' || doc.slide_type=='Continue'",
+ "fieldname": "slide_module",
+ "fieldtype": "Link",
+ "label": "Module",
+ "options": "Module Def"
+ },
+ {
+ "collapsible_depends_on": "eval:doc.slide_type=='Create' || doc.slide_type=='Settings'",
+ "fieldname": "section_break_18",
+ "fieldtype": "Section Break",
+ "label": "Fields"
+ },
+ {
+ "default": "0",
+ "fieldname": "is_completed",
+ "fieldtype": "Check",
+ "hidden": 1,
+ "label": "Is Completed",
+ "print_hide": 1
+ }
+ ],
+ "modified": "2019-12-04 10:50:43.528901",
+ "modified_by": "Administrator",
+ "module": "Desk",
+ "name": "Onboarding Slide",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "share": 1,
+ "write": 1
+ }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/desk/doctype/onboarding_slide/onboarding_slide.py b/frappe/desk/doctype/onboarding_slide/onboarding_slide.py
new file mode 100644
index 0000000000..8c75d10b9a
--- /dev/null
+++ b/frappe/desk/doctype/onboarding_slide/onboarding_slide.py
@@ -0,0 +1,134 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+import json
+from frappe import _
+from frappe.model.document import Document
+from frappe.modules.export_file import export_to_files
+
+class OnboardingSlide(Document):
+ def validate(self):
+ if self.slide_type == 'Continue' and frappe.db.exists('Onboarding Slide', {'slide_type': 'Continue', 'name': ('!=', self.name)}):
+ frappe.throw(_('An Onboarding Slide of Slide Type Continue already exists.'))
+
+ if self.slide_order:
+ same_order_slide = frappe.db.exists('Onboarding Slide', {'slide_order': self.slide_order, 'name': ('!=', self.name)})
+ if same_order_slide:
+ frappe.throw(_('An Onboarding Slide {0} with the same slide order already exists').format(same_order_slide))
+
+ def on_update(self):
+ if self.ref_doctype:
+ module = frappe.db.get_value('DocType', self.ref_doctype, 'module')
+ else:
+ module = self.slide_module
+ export_to_files(record_list=[['Onboarding Slide', self.name]], record_module=module)
+
+def get_onboarding_slides_as_list():
+ slides = []
+ slide_docs = frappe.db.get_all('Onboarding Slide',
+ filters={'is_completed': 0},
+ or_filters={'slide_order': ('!=', 0), 'slide_type': 'Continue'},
+ order_by='slide_order')
+
+ # to check if continue slide is required
+ first_slide = get_first_slide()
+
+ for entry in slide_docs:
+ # using get_doc because child table fields are not fetched in get_all
+ slide_doc = frappe.get_doc('Onboarding Slide', entry.name)
+ if frappe.scrub(slide_doc.app) in frappe.get_installed_apps():
+ slide = frappe._dict(
+ slide_type=slide_doc.slide_type,
+ title=slide_doc.slide_title,
+ help=slide_doc.slide_desc,
+ fields=slide_doc.slide_fields,
+ help_links=get_help_links(slide_doc),
+ add_more=slide_doc.add_more_button,
+ max_count=slide_doc.max_count,
+ image_src=get_slide_image(slide_doc),
+ ref_doctype=slide_doc.ref_doctype,
+ app=slide_doc.app
+ )
+ if slide.slide_type == 'Continue':
+ if is_continue_slide_required(first_slide):
+ slides.insert(0, slide)
+ else:
+ slides.append(slide)
+
+ return slides
+
+@frappe.whitelist()
+def get_onboarding_slides():
+ slides = []
+ slide_list = get_onboarding_slides_as_list()
+
+ active_domains = frappe.get_active_domains()
+ for slide in slide_list:
+ if not slide.domains or any(domain in active_domains for domain in slide.domains):
+ slides.append(slide)
+ return slides
+
+def get_help_links(slide_doc):
+ links=[]
+ for link in slide_doc.help_links:
+ links.append({
+ 'label': link.label,
+ 'video_id': link.video_id
+ })
+ return links
+
+def get_slide_image(slide_doc):
+ if slide_doc.image_src:
+ return slide_doc.image_src
+ return None
+
+def is_continue_slide_required(first_slide):
+ # check if first slide itself is not completed
+ if not first_slide.is_completed:
+ return False
+
+ # check if there is any active slide which is not completed
+ return frappe.db.exists('Onboarding Slide', {
+ 'is_completed': 0,
+ 'slide_order': ('!=', 0),
+ 'slide_type': ('!=', 'Continue')
+ })
+
+@frappe.whitelist()
+def create_onboarding_docs(values, doctype=None, app=None, slide_type=None):
+ data = json.loads(values)
+ doc = frappe.new_doc(doctype)
+ if hasattr(doc, 'create_onboarding_docs'):
+ doc.create_onboarding_docs(data)
+ else:
+ create_generic_onboarding_doc(data, doctype, slide_type)
+
+def create_generic_onboarding_doc(data, doctype, slide_type):
+ if slide_type == 'Settings':
+ doc = frappe.get_single(doctype)
+ for entry in data:
+ doc.set(entry, data.get(entry))
+ doc.save()
+
+ elif slide_type == 'Create':
+ doc = frappe.new_doc(doctype)
+ for entry in data:
+ doc.set(entry, data.get(entry))
+ doc.flags.ignore_mandatory = True
+ doc.flags.ignore_links = True
+ doc.insert()
+
+@frappe.whitelist()
+def mark_slide_as_completed(slide_title):
+ frappe.db.set_value('Onboarding Slide', slide_title, 'is_completed', 1)
+
+def get_first_slide():
+ slides = frappe.db.get_all('Onboarding Slide',
+ filters={'slide_order': ('!=', 0), 'slide_type': ('!=', 'Continue')},
+ order_by='slide_order',
+ fields=['name', 'is_completed']
+ )
+ return slides[0]
\ No newline at end of file
diff --git a/frappe/desk/doctype/onboarding_slide/test_onboarding_slide.py b/frappe/desk/doctype/onboarding_slide/test_onboarding_slide.py
new file mode 100644
index 0000000000..d78b9b6158
--- /dev/null
+++ b/frappe/desk/doctype/onboarding_slide/test_onboarding_slide.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestOnboardingSlide(unittest.TestCase):
+ pass
diff --git a/frappe/desk/doctype/onboarding_slide_field/__init__.py b/frappe/desk/doctype/onboarding_slide_field/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/desk/doctype/onboarding_slide_field/onboarding_slide_field.json b/frappe/desk/doctype/onboarding_slide_field/onboarding_slide_field.json
new file mode 100644
index 0000000000..0992aed092
--- /dev/null
+++ b/frappe/desk/doctype/onboarding_slide_field/onboarding_slide_field.json
@@ -0,0 +1,74 @@
+{
+ "creation": "2019-11-13 13:35:08.617909",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "label",
+ "fieldtype",
+ "fieldname",
+ "align",
+ "placeholder",
+ "reqd",
+ "column_break_4",
+ "options"
+ ],
+ "fields": [
+ {
+ "fieldname": "label",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Label"
+ },
+ {
+ "fieldname": "fieldtype",
+ "fieldtype": "Select",
+ "in_list_view": 1,
+ "label": "Fieldtype",
+ "options": "Attach\nAttach Image\nCheck\nCurrency\nData\nDate\nDatetime\nFloat\nHTML\nInt\nRating\nSelect\nLink\nSmall Text\nText\nText Editor\nSection Break\nColumn Break"
+ },
+ {
+ "fieldname": "fieldname",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Fieldname"
+ },
+ {
+ "fieldname": "align",
+ "fieldtype": "Select",
+ "label": "Align",
+ "options": "\ncenter\nleft\nright"
+ },
+ {
+ "fieldname": "placeholder",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Placeholder"
+ },
+ {
+ "default": "0",
+ "fieldname": "reqd",
+ "fieldtype": "Check",
+ "label": "Mandatory"
+ },
+ {
+ "fieldname": "column_break_4",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "options",
+ "fieldtype": "Text",
+ "in_list_view": 1,
+ "label": "Options"
+ }
+ ],
+ "istable": 1,
+ "modified": "2019-12-02 16:43:51.930018",
+ "modified_by": "Administrator",
+ "module": "Desk",
+ "name": "Onboarding Slide Field",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC"
+}
\ No newline at end of file
diff --git a/frappe/desk/doctype/onboarding_slide_field/onboarding_slide_field.py b/frappe/desk/doctype/onboarding_slide_field/onboarding_slide_field.py
new file mode 100644
index 0000000000..74b6782ff8
--- /dev/null
+++ b/frappe/desk/doctype/onboarding_slide_field/onboarding_slide_field.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class OnboardingSlideField(Document):
+ pass
diff --git a/frappe/desk/doctype/onboarding_slide_help_link/__init__.py b/frappe/desk/doctype/onboarding_slide_help_link/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/desk/doctype/onboarding_slide_help_link/onboarding_slide_help_link.json b/frappe/desk/doctype/onboarding_slide_help_link/onboarding_slide_help_link.json
new file mode 100644
index 0000000000..a09ba50553
--- /dev/null
+++ b/frappe/desk/doctype/onboarding_slide_help_link/onboarding_slide_help_link.json
@@ -0,0 +1,35 @@
+{
+ "creation": "2019-11-19 12:22:42.805741",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "label",
+ "video_id"
+ ],
+ "fields": [
+ {
+ "fieldname": "label",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Label"
+ },
+ {
+ "fieldname": "video_id",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Video"
+ }
+ ],
+ "istable": 1,
+ "modified": "2019-11-19 13:39:57.716248",
+ "modified_by": "Administrator",
+ "module": "Desk",
+ "name": "Onboarding Slide Help Link",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/desk/doctype/onboarding_slide_help_link/onboarding_slide_help_link.py b/frappe/desk/doctype/onboarding_slide_help_link/onboarding_slide_help_link.py
new file mode 100644
index 0000000000..6ee5e4f7d7
--- /dev/null
+++ b/frappe/desk/doctype/onboarding_slide_help_link/onboarding_slide_help_link.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class OnboardingSlideHelpLink(Document):
+ pass
diff --git a/frappe/desk/form/utils.py b/frappe/desk/form/utils.py
index 6676bd1908..cf2a8f0879 100644
--- a/frappe/desk/form/utils.py
+++ b/frappe/desk/form/utils.py
@@ -105,7 +105,7 @@ def get_next(doctype, value, prev, filters, sort_order, sort_field):
res = frappe.get_list(doctype,
fields = ["name"],
filters = filters,
- order_by = sort_field + " " + sort_order,
+ order_by = "`tab{0}`.{1}".format(doctype, sort_field) + " " + sort_order,
limit_start=0, limit_page_length=1, as_list=True)
if not res:
diff --git a/frappe/desk/listview.py b/frappe/desk/listview.py
index fd0833eb51..e7f56d313e 100644
--- a/frappe/desk/listview.py
+++ b/frappe/desk/listview.py
@@ -48,7 +48,7 @@ def get_group_by_count(doctype, current_filters, field):
else:
return frappe.db.get_list(doctype,
filters=current_filters,
- group_by=field,
+ group_by='`tab{0}`.{1}'.format(doctype, field),
fields=['count(*) as count', '`{}` as name'.format(field)],
order_by='count desc',
limit=50,
diff --git a/frappe/desk/moduleview.py b/frappe/desk/moduleview.py
index c5e5ea7c2b..0bad171b04 100644
--- a/frappe/desk/moduleview.py
+++ b/frappe/desk/moduleview.py
@@ -234,8 +234,11 @@ def get_config(app, module):
for item in section["items"]:
if item["type"]=="report" and item["name"] in disabled_reports:
continue
+ # some module links might not have name
+ if not item.get("name"):
+ item["name"] = item.get("label")
if not item.get("label"):
- item["label"] = _(item["name"])
+ item["label"] = _(item.get("name"))
items.append(item)
section['items'] = items
@@ -297,7 +300,7 @@ def get_onboard_items(app, module):
@frappe.whitelist()
def get_links_for_module(app, module):
- return [l.get('label') for l in get_links(app, module)]
+ return [{'value': l.get('name'), 'label': l.get('label')} for l in get_links(app, module)]
def get_links(app, module):
try:
@@ -330,13 +333,13 @@ def get_desktop_settings():
def apply_user_saved_links(module):
module = frappe._dict(module)
all_links = get_links(module.app, module.module_name)
- module_links_by_label = {}
+ module_links_by_name = {}
for link in all_links:
- module_links_by_label[link['label']] = link
+ module_links_by_name[link['name']] = link
if module.module_name in user_saved_links_by_module:
user_links = frappe.parse_json(user_saved_links_by_module[module.module_name])
- module.links = [module_links_by_label[l] for l in user_links if l in module_links_by_label]
+ module.links = [module_links_by_name[l] for l in user_links if l in module_links_by_name]
return module
diff --git a/frappe/desk/notifications.py b/frappe/desk/notifications.py
index 84d515050c..b142047059 100644
--- a/frappe/desk/notifications.py
+++ b/frappe/desk/notifications.py
@@ -11,15 +11,19 @@ import json
@frappe.whitelist()
@frappe.read_only()
def get_notifications():
+ out = {
+ "open_count_doctype": {},
+ "targets": {},
+ }
if (frappe.flags.in_install or
not frappe.db.get_single_value('System Settings', 'setup_complete')):
- return {
- "open_count_doctype": {},
- "targets": {},
- }
+ return out
config = get_notification_config()
+ if not config:
+ return out
+
groups = list(config.get("for_doctype")) + list(config.get("for_module"))
cache = frappe.cache()
@@ -31,10 +35,10 @@ def get_notifications():
if count is not None:
notification_count[name] = count
- return {
- "open_count_doctype": get_notifications_for_doctypes(config, notification_count),
- "targets": get_notifications_for_targets(config, notification_percent),
- }
+ out['open_count_doctype'] = get_notifications_for_doctypes(config, notification_count)
+ out['targets'] = get_notifications_for_targets(config, notification_percent)
+
+ return out
def get_notifications_for_doctypes(config, notification_count):
"""Notifications for DocTypes"""
@@ -118,6 +122,10 @@ def clear_notifications(user=None):
return
cache = frappe.cache()
config = get_notification_config()
+
+ if not config:
+ return
+
for_doctype = list(config.get('for_doctype')) if config.get('for_doctype') else []
for_module = list(config.get('for_module')) if config.get('for_module') else []
groups = for_doctype + for_module
@@ -139,6 +147,8 @@ def delete_notification_count_for(doctype):
def clear_doctype_notifications(doc, method=None, *args, **kwargs):
config = get_notification_config()
+ if not config:
+ return
if isinstance(doc, string_types):
doctype = doc # assuming doctype name was passed directly
else:
diff --git a/frappe/desk/page/leaderboard/leaderboard.css b/frappe/desk/page/leaderboard/leaderboard.css
index dbe9cca5b8..a3cb4d09c4 100644
--- a/frappe/desk/page/leaderboard/leaderboard.css
+++ b/frappe/desk/page/leaderboard/leaderboard.css
@@ -19,6 +19,14 @@
background: #f0f4f7;
}
+.from-date-field .clearfix{
+ display: none;
+}
+
+.from-date-field {
+ margin-left: 10px;
+}
+
.select-time:focus, .select-doctype:focus, .select-filter:focus, .select-sort:focus {
background: #f0f4f7;
}
diff --git a/frappe/desk/page/leaderboard/leaderboard.js b/frappe/desk/page/leaderboard/leaderboard.js
index 3e4c36add0..c64d2dcb4f 100644
--- a/frappe/desk/page/leaderboard/leaderboard.js
+++ b/frappe/desk/page/leaderboard/leaderboard.js
@@ -41,7 +41,11 @@ class Leaderboard {
return field;
});
}
- this.timespans = ["Week", "Month", "Quarter", "Year", "All Time"];
+ this.timespans = [
+ "This Week", "This Month", "This Quarter", "This Year",
+ "Last Week", "Last Month", "Last Quarter", "Last Year",
+ "All Time", "Select From Date"
+ ];
// for saving current selected filters
const _initial_doctype = frappe.get_route()[1] || this.doctypes[0];
@@ -103,7 +107,8 @@ class Leaderboard {
this.timespans.map(d => {
return {"label": __(d), value: d };
})
- );
+ );
+ this.create_from_date_field();
this.type_select = this.page.add_select(__("Field"),
this.options.selected_filter.map(d => {
@@ -113,7 +118,12 @@ class Leaderboard {
this.timespan_select.on("change", (e) => {
this.options.selected_timespan = e.currentTarget.value;
- this.make_request();
+ if (this.options.selected_timespan === 'Select From Date') {
+ this.from_date_field.show();
+ } else {
+ this.from_date_field.hide();
+ this.make_request();
+ }
});
this.type_select.on("change", (e) => {
@@ -122,6 +132,28 @@ class Leaderboard {
});
}
+ create_from_date_field() {
+ let timespan_field = $(this.parent).find(`.frappe-control[data-original-title='Timespan']`);
+ this.from_date_field = $(``).insertAfter(timespan_field).hide();
+
+ let date_field = frappe.ui.form.make_control({
+ df: {
+ fieldtype: 'Date',
+ fieldname: 'selected_from_date',
+ placeholder: frappe.datetime.month_start(),
+ default: frappe.datetime.month_start(),
+ input_class: 'input-sm',
+ reqd: 1,
+ change: () => {
+ this.selected_from_date = date_field.get_value();
+ if (this.selected_from_date) this.make_request();
+ }
+ },
+ parent: $(this.parent).find('.from-date-field'),
+ render_input: 1
+ });
+ }
+
render_selected_doctype() {
this.$sidebar_list.on("click", "li", (e)=> {
@@ -207,7 +239,6 @@ class Leaderboard {
this.leaderboard_config[this.options.selected_doctype].method,
{
'from_date': this.get_from_date(),
- 'timespan': this.options.selected_timespan,
'company': this.options.selected_company,
'field': this.options.selected_filter_item,
'limit': this.leaderboard_limit,
@@ -360,17 +391,20 @@ class Leaderboard {
get_from_date() {
let timespan = this.options.selected_timespan.toLowerCase();
let current_date = frappe.datetime.now_date();
- let date = '';
- if (timespan === "month") {
- date = frappe.datetime.add_months(current_date, -1);
- } else if (timespan === "quarter") {
- date = frappe.datetime.add_months(current_date, -3);
- } else if (timespan === "year") {
- date = frappe.datetime.add_months(current_date, -12);
- } else if (timespan === "week") {
- date = frappe.datetime.add_days(current_date, -7);
+ let get_from_date = {
+ "this week": frappe.datetime.week_start(),
+ "this month": frappe.datetime.month_start(),
+ "this quarter": frappe.datetime.quarter_start(),
+ "this year": frappe.datetime.year_start(),
+ "last week": frappe.datetime.add_days(current_date, -7),
+ "last month": frappe.datetime.add_months(current_date, -1),
+ "last quarter": frappe.datetime.add_months(current_date, -3),
+ "last year": frappe.datetime.add_months(current_date, -12),
+ "all time": "",
+ "select from date": this.selected_from_date || frappe.datetime.month_start()
}
- return date;
+
+ return get_from_date[timespan];
}
}
diff --git a/frappe/desk/page/setup_wizard/install_fixtures.py b/frappe/desk/page/setup_wizard/install_fixtures.py
index bb598ab180..e93b71291f 100644
--- a/frappe/desk/page/setup_wizard/install_fixtures.py
+++ b/frappe/desk/page/setup_wizard/install_fixtures.py
@@ -10,6 +10,7 @@ from frappe.desk.doctype.global_search_settings.global_search_settings import up
def install():
update_genders_and_salutations()
update_global_search_doctypes()
+ setup_email_linking()
@frappe.whitelist()
def update_genders_and_salutations():
@@ -20,13 +21,10 @@ def update_genders_and_salutations():
for record in records:
doc = frappe.new_doc(record.get("doctype"))
doc.update(record)
+ doc.insert(ignore_permissions=True, ignore_if_duplicate=True)
- try:
- doc.insert(ignore_permissions=True)
- except frappe.DuplicateEntryError as e:
- # pass DuplicateEntryError and continue
- if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name:
- # make sure DuplicateEntryError is for the exact same doc and not a related doc
- pass
- else:
- raise
\ No newline at end of file
+def setup_email_linking():
+ doc = frappe.get_doc({
+ "doctype": "Email Account",
+ "email_id": "email_linking@example.com",
+ }).insert(ignore_permissions=True, ignore_if_duplicate=True)
\ No newline at end of file
diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index d5b43807a8..5db6ae18bf 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -9,8 +9,10 @@ from six.moves import range
import frappe.permissions
from frappe.model.db_query import DatabaseQuery
from frappe import _
-from six import text_type, string_types, StringIO
+from six import string_types, StringIO
from frappe.core.doctype.access_log.access_log import make_access_log
+from frappe.utils import cstr
+
@frappe.whitelist()
@frappe.read_only()
@@ -170,11 +172,11 @@ def export_query():
writer = csv.writer(f)
for r in data:
# encode only unicode type strings and not int, floats etc.
- writer.writerow([handle_html(frappe.as_unicode(v)).encode('utf-8') \
+ writer.writerow([handle_html(frappe.as_unicode(v)) \
if isinstance(v, string_types) else v for v in r])
f.seek(0)
- frappe.response['result'] = text_type(f.read(), 'utf-8')
+ frappe.response['result'] = cstr(f.read())
frappe.response['type'] = 'csv'
frappe.response['doctype'] = title
@@ -261,17 +263,24 @@ def delete_bulk(doctype, items):
@frappe.whitelist()
@frappe.read_only()
def get_sidebar_stats(stats, doctype, filters=[]):
+ _user_tags = []
+ data = frappe._dict(frappe.local.form_dict)
+ filters = json.loads(data["filters"])
- if not frappe.cache().hget("tags_count", doctype):
- tags = [tag.name for tag in frappe.get_list("Tag")]
- _user_tags = []
- for tag in tags:
- count = frappe.db.count("Tag Link", filters={"document_type": doctype, "tag": tag})
- if count > 0:
- _user_tags.append([tag, count])
- frappe.cache().hset("tags_count", doctype, _user_tags)
+ if not frappe.cache().hget("Tags", doctype):
+ tags = set([tag.tag for tag in frappe.get_list("Tag Link", filters={"document_type": doctype}, fields=["tag"])])
+ frappe.cache().hset("Tags", doctype, tags)
- return {"stats": {"_user_tags": frappe.cache().hget("tags_count", doctype)}}
+ for tag in list(frappe.cache().hget("Tags", doctype)):
+ tag_filters = []
+ tag_filters.extend(filters)
+ tag_filters.extend([['Tag Link', 'tag', '=', tag]])
+
+ count = frappe.get_all(doctype, filters=tag_filters, fields=["count(*)"])
+ if count[0].get("count(*)") > 0:
+ _user_tags.append([tag, count[0].get("count(*)")])
+
+ return {"stats": {"_user_tags": _user_tags}}
@frappe.whitelist()
@frappe.read_only()
diff --git a/frappe/desk/search.py b/frappe/desk/search.py
index 7bcfe646ab..c70b650945 100644
--- a/frappe/desk/search.py
+++ b/frappe/desk/search.py
@@ -50,7 +50,7 @@ def sanitize_searchfield(searchfield):
# this is called by the Link Field
@frappe.whitelist()
def search_link(doctype, txt, query=None, filters=None, page_length=20, searchfield=None, reference_doctype=None, ignore_user_permissions=False):
- search_widget(doctype, txt, query, searchfield=searchfield, page_length=page_length, filters=filters, reference_doctype=reference_doctype, ignore_user_permissions=ignore_user_permissions)
+ search_widget(doctype, txt.strip(), query, searchfield=searchfield, page_length=page_length, filters=filters, reference_doctype=reference_doctype, ignore_user_permissions=ignore_user_permissions)
frappe.response['results'] = build_for_autosuggest(frappe.response["values"])
del frappe.response["values"]
diff --git a/frappe/desk/user_progress.py b/frappe/desk/user_progress.py
deleted file mode 100644
index f62bb2a29d..0000000000
--- a/frappe/desk/user_progress.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
-
-from __future__ import unicode_literals
-
-import frappe
-from frappe.utils import cint
-
-@frappe.whitelist()
-def get_user_progress_slides():
- '''
- Return user progress slides for the desktop (called via `get_user_progress_slides` hook)
- '''
- slides = []
- if cint(frappe.db.get_single_value('System Settings', 'setup_complete')):
- for fn in frappe.get_hooks('get_user_progress_slides'):
- slides += frappe.get_attr(fn)()
-
- return slides
-
-@frappe.whitelist()
-def update_and_get_user_progress():
- '''
- Return setup progress action states (called via `update_and_get_user_progress` hook)
- '''
- states = {}
- for fn in frappe.get_hooks('update_and_get_user_progress'):
- states.update(frappe.get_attr(fn)())
-
- return states
diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index f10f08664c..c05a0f3fe4 100755
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -21,7 +21,6 @@ from frappe.desk.form import assign_to
from frappe.utils.user import get_system_managers
from frappe.utils.background_jobs import enqueue, get_jobs
from frappe.core.doctype.communication.email import set_incoming_outgoing_accounts
-from frappe.utils.scheduler import log
from frappe.utils.html_utils import clean_email_html
from frappe.email.utils import get_port
@@ -284,7 +283,7 @@ class EmailAccount(Document):
except Exception:
frappe.db.rollback()
- log('email_account.receive')
+ frappe.log_error('email_account.receive')
if self.use_imap:
self.handle_bad_emails(email_server, uid, msg, frappe.get_traceback())
exceptions.append(frappe.get_traceback())
diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py
index 4f3e7994a5..b0d1756643 100755
--- a/frappe/email/doctype/newsletter/newsletter.py
+++ b/frappe/email/doctype/newsletter/newsletter.py
@@ -9,7 +9,6 @@ from frappe import throw, _
from frappe.website.website_generator import WebsiteGenerator
from frappe.utils.verified_command import get_signed_params, verify_request
from frappe.utils.background_jobs import enqueue
-from frappe.utils.scheduler import log
from frappe.email.queue import send
from frappe.email.doctype.email_group.email_group import add_subscribers
from frappe.utils import parse_addr
@@ -213,7 +212,7 @@ def send_newsletter(newsletter):
doc.db_set("email_sent", 0)
frappe.db.commit()
- log("send_newsletter")
+ frappe.log_error("send_newsletter")
raise
diff --git a/frappe/email/doctype/notification/test_notification.py b/frappe/email/doctype/notification/test_notification.py
index 4d3c3167a5..b9bbde172d 100644
--- a/frappe/email/doctype/notification/test_notification.py
+++ b/frappe/email/doctype/notification/test_notification.py
@@ -136,7 +136,7 @@ class TestNotification(unittest.TestCase):
"reference_name": event.name, "status": "Not Sent"}))
frappe.set_user('Administrator')
- frappe.utils.scheduler.trigger(frappe.local.site, "daily", now=True)
+ frappe.get_doc('Scheduled Job Type', dict(method='frappe.email.doctype.notification.notification.trigger_daily_alerts')).execute()
# not today, so no alert
self.assertFalse(frappe.db.get_value("Email Queue", {"reference_doctype": "Event",
@@ -150,7 +150,7 @@ class TestNotification(unittest.TestCase):
self.assertFalse(frappe.db.get_value("Email Queue", {"reference_doctype": "Event",
"reference_name": event.name, "status": "Not Sent"}))
- frappe.utils.scheduler.trigger(frappe.local.site, "daily", now=True)
+ frappe.get_doc('Scheduled Job Type', dict(method='frappe.email.doctype.notification.notification.trigger_daily_alerts')).execute()
# today so show alert
self.assertTrue(frappe.db.get_value("Email Queue", {"reference_doctype": "Event",
diff --git a/frappe/email/queue.py b/frappe/email/queue.py
index f51451751d..792b47296a 100755
--- a/frappe/email/queue.py
+++ b/frappe/email/queue.py
@@ -12,7 +12,6 @@ from frappe.utils.verified_command import get_signed_params, verify_request
from html2text import html2text
from frappe.utils import get_url, nowdate, encode, now_datetime, add_days, split_emails, cstr, cint
from rq.timeouts import JobTimeoutException
-from frappe.utils.scheduler import log
from six import text_type, string_types
class EmailLimitCrossedError(frappe.ValidationError): pass
@@ -469,7 +468,7 @@ def send_one(email, smtpserver=None, auto_commit=True, now=False, from_test=Fals
else:
# log to Error Log
- log('frappe.email.queue.flush', text_type(e))
+ frappe.log_error('frappe.email.queue.flush')
def prepare_message(email, recipient, recipients_list):
message = email.message
diff --git a/frappe/email/receive.py b/frappe/email/receive.py
index b8fde57a43..e5c8457b4e 100644
--- a/frappe/email/receive.py
+++ b/frappe/email/receive.py
@@ -12,7 +12,6 @@ import frappe
from frappe import _, safe_decode, safe_encode
from frappe.utils import (extract_email_id, convert_utc_to_user_timezone, now,
cint, cstr, strip, markdown, parse_addr)
-from frappe.utils.scheduler import log
from frappe.core.doctype.file.file import get_random_filename, MaxFileSizeReachedError
class EmailSizeExceededError(frappe.ValidationError): pass
@@ -80,7 +79,7 @@ class EmailServer:
except _socket.error:
# log performs rollback and logs error in Error Log
- log("receive.connect_pop")
+ frappe.log_error("receive.connect_pop")
# Invalid mail server -- due to refusing connection
frappe.msgprint(_('Invalid Mail Server. Please rectify and try again.'))
@@ -255,7 +254,7 @@ class EmailServer:
else:
# log performs rollback and logs error in Error Log
- log("receive.get_messages", self.make_error_msg(msg_num, incoming_mail))
+ frappe.log_error("receive.get_messages", self.make_error_msg(msg_num, incoming_mail))
self.errors = True
frappe.db.rollback()
@@ -457,9 +456,9 @@ class Email:
def show_attached_email_headers_in_content(self, part):
# get the multipart/alternative message
try:
- from html import escape # python 3.x
+ from html import escape # python 3.x
except ImportError:
- from cgi import escape # python 2.x
+ from cgi import escape # python 2.x
message = list(part.walk())[1]
headers = []
@@ -481,7 +480,7 @@ class Email:
"""Detect chartset."""
charset = part.get_content_charset()
if not charset:
- charset = chardet.detect(frappe.safe_encode(part))['encoding']
+ charset = chardet.detect(cstr(part))['encoding']
return charset
@@ -515,7 +514,7 @@ class Email:
'fcontent': fcontent,
})
- cid = (part.get("Content-Id") or "").strip("><")
+ cid = (cstr(part.get("Content-Id")) or "").strip("><")
if cid:
self.cid_map[fname] = cid
diff --git a/frappe/geo/doctype/currency/currency.js b/frappe/geo/doctype/currency/currency.js
index 1bc9865999..af2d6ebc4e 100644
--- a/frappe/geo/doctype/currency/currency.js
+++ b/frappe/geo/doctype/currency/currency.js
@@ -7,10 +7,5 @@ frappe.ui.form.on('Currency', {
if(!frm.doc.enabled) {
frm.set_intro(__("This Currency is disabled. Enable to use in transactions"));
}
- },
-
- after_save(frm) {
- if (frm.doc.enabled)
- locals[':Currency'][frm.doc.name] = Object.assign(frm.doc, { doctype: ':Currency' });
}
});
diff --git a/frappe/hooks.py b/frappe/hooks.py
index b35387efe9..5406d0fc57 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -76,8 +76,7 @@ leaderboards = "frappe.desk.leaderboard.get_leaderboards"
on_session_creation = [
"frappe.core.doctype.activity_log.feed.login_feed",
- "frappe.core.doctype.user.user.notify_admin_access_to_system_manager",
- "frappe.utils.scheduler.reset_enabled_scheduler_events",
+ "frappe.core.doctype.user.user.notify_admin_access_to_system_manager"
]
on_logout = "frappe.core.doctype.session_default_settings.session_default_settings.clear_session_defaults"
@@ -153,14 +152,18 @@ doc_events = {
}
scheduler_events = {
+ "cron": {
+ "0/15 * * * *": [
+ "frappe.oauth.delete_oauth2_data",
+ "frappe.website.doctype.web_page.web_page.check_publish_status",
+ "frappe.twofactor.delete_all_barcodes_for_users"
+ ]
+ },
"all": [
"frappe.email.queue.flush",
"frappe.email.doctype.email_account.email_account.pull",
"frappe.email.doctype.email_account.email_account.notify_unreplied",
- "frappe.oauth.delete_oauth2_data",
"frappe.integrations.doctype.razorpay_settings.razorpay_settings.capture_payment",
- "frappe.twofactor.delete_all_barcodes_for_users",
- "frappe.website.doctype.web_page.web_page.check_publish_status",
'frappe.utils.global_search.sync_global_search'
],
"hourly": [
diff --git a/frappe/installer.py b/frappe/installer.py
index 764a0b6780..4b07ab8ce8 100755
--- a/frappe/installer.py
+++ b/frappe/installer.py
@@ -18,15 +18,16 @@ from frappe.utils.fixtures import sync_fixtures
from frappe.website import render
from frappe.modules.utils import sync_customizations
from frappe.database import setup_database
+from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs
def install_db(root_login="root", root_password=None, db_name=None, source_sql=None,
- admin_password=None, verbose=True, force=0, site_config=None, reinstall=False,
- db_type=None):
+ admin_password=None, verbose=True, force=0, site_config=None, reinstall=False,
+ db_type=None, db_host=None, db_port=None):
if not db_type:
db_type = frappe.conf.db_type or 'mariadb'
- make_conf(db_name, site_config=site_config, db_type=db_type)
+ make_conf(db_name, site_config=site_config, db_type=db_type, db_host=db_host, db_port=db_port)
frappe.flags.in_install_db = True
frappe.flags.root_login = root_login
@@ -91,6 +92,7 @@ def install_app(name, verbose=False, set_as_patched=True):
for after_install in app_hooks.after_install or []:
frappe.get_attr(after_install)()
+ sync_jobs()
sync_fixtures(name)
sync_customizations(name)
@@ -189,14 +191,14 @@ def init_singles():
doc.flags.ignore_validate=True
doc.save()
-def make_conf(db_name=None, db_password=None, site_config=None, db_type=None):
+def make_conf(db_name=None, db_password=None, site_config=None, db_type=None, db_host=None, db_port=None):
site = frappe.local.site
- make_site_config(db_name, db_password, site_config, db_type=db_type)
+ make_site_config(db_name, db_password, site_config, db_type=db_type, db_host=db_host, db_port=db_port)
sites_path = frappe.local.sites_path
frappe.destroy()
frappe.init(site, sites_path=sites_path)
-def make_site_config(db_name=None, db_password=None, site_config=None, db_type=None):
+def make_site_config(db_name=None, db_password=None, site_config=None, db_type=None, db_host=None, db_port=None):
frappe.create_folder(os.path.join(frappe.local.site_path))
site_file = get_site_config_path()
@@ -207,6 +209,12 @@ def make_site_config(db_name=None, db_password=None, site_config=None, db_type=N
if db_type:
site_config['db_type'] = db_type
+ if db_host:
+ site_config['db_host'] = db_host
+
+ if db_port:
+ site_config['db_port'] = db_port
+
with open(site_file, "w") as f:
f.write(json.dumps(site_config, indent=1, sort_keys=True))
diff --git a/frappe/integrations/doctype/social_login_key/social_login_key.json b/frappe/integrations/doctype/social_login_key/social_login_key.json
index 8e415e6c20..290aae0e4e 100644
--- a/frappe/integrations/doctype/social_login_key/social_login_key.json
+++ b/frappe/integrations/doctype/social_login_key/social_login_key.json
@@ -1,700 +1,183 @@
{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 1,
- "allow_rename": 0,
- "beta": 0,
- "creation": "2017-11-18 15:36:09.676722",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Document",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "allow_import": 1,
+ "creation": "2017-11-18 15:36:09.676722",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "enable_social_login",
+ "client_credentials",
+ "social_login_provider",
+ "client_id",
+ "column_break_0",
+ "provider_name",
+ "client_secret",
+ "sb_identity_details",
+ "icon",
+ "column_break_1",
+ "base_url",
+ "client_urls",
+ "authorize_url",
+ "access_token_url",
+ "column_break_3",
+ "redirect_url",
+ "api_endpoint",
+ "custom_base_url",
+ "client_information",
+ "api_endpoint_args",
+ "auth_url_data",
+ "user_id_property"
+ ],
"fields": [
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "enable_social_login",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Enable Social Login",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "default": "0",
+ "fieldname": "enable_social_login",
+ "fieldtype": "Check",
+ "label": "Enable Social Login"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "collapsible_depends_on": "eval:doc.enable_social_login",
- "columns": 0,
- "fieldname": "client_credentials",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Client Credentials",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "collapsible": 1,
+ "collapsible_depends_on": "eval:doc.enable_social_login",
+ "fieldname": "client_credentials",
+ "fieldtype": "Section Break",
+ "label": "Client Credentials"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "Custom",
- "depends_on": "eval:doc.custom!=1",
- "fieldname": "social_login_provider",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Social Login Provider",
- "length": 0,
- "no_copy": 0,
- "options": "Custom\nFacebook\nFrappe\nGitHub\nGoogle\nOffice 365\nSalesforce\nfairlogin",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 1,
- "unique": 0
- },
+ "default": "Custom",
+ "depends_on": "eval:doc.custom!=1",
+ "fieldname": "social_login_provider",
+ "fieldtype": "Select",
+ "label": "Social Login Provider",
+ "options": "Custom\nFacebook\nFrappe\nGitHub\nGoogle\nOffice 365\nSalesforce\nfairlogin",
+ "set_only_once": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "client_id",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Client ID",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "client_id",
+ "fieldtype": "Data",
+ "label": "Client ID"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_0",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "column_break_0",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "provider_name",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Provider Name",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 1,
- "unique": 0
- },
+ "fieldname": "provider_name",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Provider Name",
+ "reqd": 1,
+ "set_only_once": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "client_secret",
- "fieldtype": "Password",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Client Secret",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "client_secret",
+ "fieldtype": "Password",
+ "label": "Client Secret"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "collapsible_depends_on": "eval:doc.custom_base_url",
- "columns": 0,
- "depends_on": "",
- "fieldname": "sb_identity_details",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Identity Details",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "collapsible": 1,
+ "collapsible_depends_on": "eval:doc.custom_base_url",
+ "fieldname": "sb_identity_details",
+ "fieldtype": "Section Break",
+ "label": "Identity Details"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "icon",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Icon",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "icon",
+ "fieldtype": "Data",
+ "label": "Icon"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_1",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "column_break_1",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "base_url",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Base URL",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "base_url",
+ "fieldtype": "Data",
+ "label": "Base URL"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "collapsible_depends_on": "eval:doc.social_login_provider===\"Custom\"",
- "columns": 0,
- "depends_on": "",
- "fieldname": "client_urls",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Client URLs",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "collapsible": 1,
+ "collapsible_depends_on": "eval:doc.social_login_provider===\"Custom\"",
+ "fieldname": "client_urls",
+ "fieldtype": "Section Break",
+ "label": "Client URLs"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "authorize_url",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Authorize URL",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "authorize_url",
+ "fieldtype": "Data",
+ "label": "Authorize URL"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "access_token_url",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Access Token URL",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "access_token_url",
+ "fieldtype": "Data",
+ "label": "Access Token URL"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_3",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "redirect_url",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Redirect URL",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "redirect_url",
+ "fieldtype": "Data",
+ "label": "Redirect URL"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "api_endpoint",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "API Endpoint",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "api_endpoint",
+ "fieldtype": "Data",
+ "label": "API Endpoint"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "custom_base_url",
- "fieldtype": "Check",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Custom Base URL",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "default": "0",
+ "fieldname": "custom_base_url",
+ "fieldtype": "Check",
+ "hidden": 1,
+ "label": "Custom Base URL"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "collapsible_depends_on": "eval:doc.social_login_provider===\"Custom\"",
- "columns": 0,
- "depends_on": "",
- "fieldname": "client_information",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Client Information",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "collapsible": 1,
+ "collapsible_depends_on": "eval:doc.social_login_provider===\"Custom\"",
+ "fieldname": "client_information",
+ "fieldtype": "Section Break",
+ "label": "Client Information"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "api_endpoint_args",
- "fieldtype": "Code",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "API Endpoint Args",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "api_endpoint_args",
+ "fieldtype": "Code",
+ "label": "API Endpoint Args"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "auth_url_data",
- "fieldtype": "Code",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Auth URL Data",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
+ "fieldname": "auth_url_data",
+ "fieldtype": "Code",
+ "label": "Auth URL Data"
+ },
+ {
+ "depends_on": "eval:doc.social_login_provider===\"Custom\"",
+ "fieldname": "user_id_property",
+ "fieldtype": "Data",
+ "label": "User ID Property"
}
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-09-15 09:00:00.000000",
- "modified_by": "Administrator",
- "module": "Integrations",
- "name": "Social Login Key",
- "name_case": "",
- "owner": "Administrator",
+ ],
+ "modified": "2019-12-03 12:35:55.115260",
+ "modified_by": "Administrator",
+ "module": "Integrations",
+ "name": "Social Login Key",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "share": 1,
"write": 1
}
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "provider_name",
- "track_changes": 1,
- "track_seen": 0
-}
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "provider_name",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/migrate.py b/frappe/migrate.py
index 6778a3f18f..043b6817d7 100644
--- a/frappe/migrate.py
+++ b/frappe/migrate.py
@@ -15,6 +15,7 @@ from frappe.desk.notifications import clear_notifications
from frappe.website import render
from frappe.core.doctype.language.language import sync_languages
from frappe.modules.utils import sync_customizations
+from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs
from frappe.utils import global_search
def migrate(verbose=True, rebuild_website=False, skip_failing=False):
@@ -46,9 +47,11 @@ def migrate(verbose=True, rebuild_website=False, skip_failing=False):
# run patches
frappe.modules.patch_handler.run_all(skip_failing)
+
# sync
frappe.model.sync.sync_all(verbose=verbose)
frappe.translate.clear_cache()
+ sync_jobs()
sync_fixtures()
sync_customizations()
sync_languages()
diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py
index 09db9bb68a..1fe92d7a67 100644
--- a/frappe/model/__init__.py
+++ b/frappe/model/__init__.py
@@ -45,7 +45,7 @@ default_fields = ('doctype','name','owner','creation','modified','modified_by',
'parent','parentfield','parenttype','idx','docstatus')
optional_fields = ("_user_tags", "_comments", "_assign", "_liked_by", "_seen")
table_fields = ('Table', 'Table MultiSelect')
-core_doctypes_list = ('DocType', 'DocField', 'DocPerm', 'User', 'Role', 'Has Role',
+core_doctypes_list = ('DocType', 'DocField', 'DocPerm', 'DocType Action', 'DocType Link', 'User', 'Role', 'Has Role',
'Page', 'Module Def', 'Print Format', 'Report', 'Customize Form',
'Customize Form Field', 'Property Setter', 'Custom Field', 'Custom Script')
diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 6c917b8d4d..a50bf9fdaf 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -22,6 +22,8 @@ max_positive_value = {
'bigint': 2 ** 63
}
+DOCTYPES_FOR_DOCTYPE = ('DocType', 'DocField', 'DocPerm', 'DocType Action', 'DocType Link')
+
_classes = {}
def get_controller(doctype):
@@ -255,7 +257,7 @@ class BaseDocument(object):
def get_valid_columns(self):
if self.doctype not in frappe.local.valid_columns:
- if self.doctype in ("DocField", "DocPerm") and self.parent in ("DocType", "DocField", "DocPerm"):
+ if self.doctype in DOCTYPES_FOR_DOCTYPE:
from frappe.model.meta import get_table_columns
valid = get_table_columns(self.doctype)
else:
@@ -312,7 +314,7 @@ class BaseDocument(object):
self.created_by = self.modified_by = frappe.session.user
# if doctype is "DocType", don't insert null values as we don't know who is valid yet
- d = self.get_valid_dict(convert_dates_to_str=True, ignore_nulls = self.doctype in ('DocType', 'DocField', 'DocPerm'))
+ d = self.get_valid_dict(convert_dates_to_str=True, ignore_nulls = self.doctype in DOCTYPES_FOR_DOCTYPE)
columns = list(d)
try:
@@ -347,7 +349,7 @@ class BaseDocument(object):
self.db_insert()
return
- d = self.get_valid_dict(convert_dates_to_str=True, ignore_nulls = self.doctype in ('DocType', 'DocField', 'DocPerm'))
+ d = self.get_valid_dict(convert_dates_to_str=True, ignore_nulls = self.doctype in DOCTYPES_FOR_DOCTYPE)
# don't update name, as case might've been changed
name = d['name']
diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index b7feee82f4..f9016d7fcf 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -501,6 +501,10 @@ class DatabaseQuery(object):
value = f.value or "''"
fallback = "''"
+ elif f.fieldname == 'name':
+ value = f.value or "''"
+ fallback = "''"
+
else:
value = flt(f.value)
fallback = 0
@@ -513,6 +517,8 @@ class DatabaseQuery(object):
or not can_be_null
or (f.value and f.operator.lower() in ('=', 'like'))
or 'ifnull(' in column_name.lower()):
+ if f.operator.lower() == 'like' and frappe.conf.get('db_type') == 'postgres':
+ f.operator = 'ilike'
condition = '{column_name} {operator} {value}'.format(
column_name=column_name, operator=f.operator,
value=value)
diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index af67350ab6..43ffc6ac35 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -80,8 +80,8 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa
if not (for_reload or frappe.flags.in_migrate or frappe.flags.in_install or frappe.flags.in_test):
try:
delete_controllers(name, doc.module)
- except (FileNotFoundError, OSError):
- # in case a doctype doesnt have any controller code
+ except (FileNotFoundError, OSError, KeyError):
+ # in case a doctype doesnt have any controller code nor any app and module
pass
else:
@@ -332,8 +332,8 @@ def clear_references(doctype, reference_doctype, reference_name,
(reference_doctype, reference_name))
def clear_timeline_references(link_doctype, link_name):
- frappe.db.sql("""delete from `tabCommunication Link`
- where `tabCommunication Link`.link_doctype='{0}' and `tabCommunication Link`.link_name='{1}'""".format(link_doctype, link_name)) # nosec
+ frappe.db.sql("""DELETE FROM `tabCommunication Link`
+ WHERE `tabCommunication Link`.link_doctype=%s AND `tabCommunication Link`.link_name=%s""", (link_doctype, link_name))
def insert_feed(doc):
from frappe.utils import get_fullname
diff --git a/frappe/model/document.py b/frappe/model/document.py
index 7f04895308..c58e09ef5a 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -150,8 +150,8 @@ class Document(BaseDocument):
super(Document, self).__init__(d)
if self.name=="DocType" and self.doctype=="DocType":
- from frappe.model.meta import doctype_table_fields
- table_fields = doctype_table_fields
+ from frappe.model.meta import DOCTYPE_TABLE_FIELDS
+ table_fields = DOCTYPE_TABLE_FIELDS
else:
table_fields = self.meta.get_table_fields()
diff --git a/frappe/model/meta.py b/frappe/model/meta.py
index 0b1011b119..927a56b6b8 100644
--- a/frappe/model/meta.py
+++ b/frappe/model/meta.py
@@ -151,7 +151,7 @@ class Meta(Document):
if self.name!="DocType":
self._table_fields = self.get('fields', {"fieldtype": ['in', table_fields]})
else:
- self._table_fields = doctype_table_fields
+ self._table_fields = DOCTYPE_TABLE_FIELDS
return self._table_fields
@@ -165,7 +165,7 @@ class Meta(Document):
def get_valid_columns(self):
if not hasattr(self, "_valid_columns"):
- if self.name in ("DocType", "DocField", "DocPerm", "Property Setter"):
+ if self.name in ("DocType", "DocField", "DocPerm", 'DocType Action', 'DocType Link', "Property Setter"):
self._valid_columns = get_table_columns(self.name)
else:
self._valid_columns = self.default_fields + \
@@ -174,7 +174,12 @@ class Meta(Document):
return self._valid_columns
def get_table_field_doctype(self, fieldname):
- return { "fields": "DocField", "permissions": "DocPerm"}.get(fieldname)
+ return {
+ "fields": "DocField",
+ "permissions": "DocPerm",
+ "actions": "DocType Action",
+ 'links': 'DocType Link'
+ }.get(fieldname)
def get_field(self, fieldname):
'''Return docfield from meta'''
@@ -419,11 +424,44 @@ class Meta(Document):
except ImportError:
pass
+ self.add_doctype_links(data)
+
for hook in frappe.get_hooks("override_doctype_dashboards", {}).get(self.name, []):
data = frappe.get_attr(hook)(data=data)
return data
+ def add_doctype_links(self, data):
+ '''add `links` child table in standard link dashboard format'''
+ if hasattr(self, 'links') and self.links:
+ if not data.transactions:
+ # init groups
+ data.transactions = []
+ data.non_standard_fieldnames = {}
+
+ for link in self.links:
+ link.added = False
+ for group in data.transactions:
+ # group found
+ if group.label == link.label:
+ if not link.link_doctype in group.items:
+ group.items.append(link.link_doctype)
+ link.added = True
+
+ if not link.added:
+ # group not found, make a new group
+ data.transactions.append(dict(
+ label = link.group,
+ items = [link.link_doctype]
+ ))
+
+ if link.link_fieldname != data.fieldname:
+ if data.fieldname:
+ data.non_standard_fieldnames[link.link_doctype] = link.link_fieldname
+ else:
+ data.fieldname = link.link_fieldname
+
+
def get_row_template(self):
return self.get_web_template(suffix='_row')
@@ -441,9 +479,11 @@ class Meta(Document):
def is_nested_set(self):
return self.has_field('lft') and self.has_field('rgt')
-doctype_table_fields = [
+DOCTYPE_TABLE_FIELDS = [
frappe._dict({"fieldname": "fields", "options": "DocField"}),
- frappe._dict({"fieldname": "permissions", "options": "DocPerm"})
+ frappe._dict({"fieldname": "permissions", "options": "DocPerm"}),
+ frappe._dict({"fieldname": "actions", "options": "DocType Action"}),
+ frappe._dict({"fieldname": "links", "options": "DocType Link"}),
]
#######
diff --git a/frappe/model/sync.py b/frappe/model/sync.py
index 18bf827c5f..b50ddb1160 100644
--- a/frappe/model/sync.py
+++ b/frappe/model/sync.py
@@ -29,6 +29,8 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe
# these need to go first at time of install
for d in (("core", "docfield"),
("core", "docperm"),
+ ("core", "doctype_action"),
+ ("core", "doctype_link"),
("core", "role"),
("core", "has_role"),
("core", "doctype"),
@@ -41,7 +43,10 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe
("data_migration", "data_migration_mapping_detail"),
("data_migration", "data_migration_mapping"),
("data_migration", "data_migration_plan_mapping"),
- ("data_migration", "data_migration_plan")):
+ ("data_migration", "data_migration_plan"),
+ ("desk", "onboarding_slide_field"),
+ ("desk", "onboarding_slide_help_link"),
+ ("desk", "onboarding_slide")):
files.append(os.path.join(frappe.get_app_path("frappe"), d[0],
"doctype", d[1], d[1] + ".json"))
@@ -70,7 +75,7 @@ def get_doc_files(files, start_path, force=0, sync_everything = False, verbose=F
# load in sequence - warning for devs
document_types = ['doctype', 'page', 'report', 'dashboard_chart_source', 'print_format',
'website_theme', 'web_form', 'notification', 'print_style',
- 'data_migration_mapping', 'data_migration_plan']
+ 'data_migration_mapping', 'data_migration_plan', 'onboarding_slide']
for doctype in document_types:
doctype_path = os.path.join(start_path, doctype)
if os.path.exists(doctype_path):
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 9473323059..9612994168 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -6,9 +6,11 @@ frappe.patches.v8_0.update_global_search_table
frappe.patches.v7_0.update_auth
frappe.patches.v8_0.drop_in_dialog #2017-09-22
frappe.patches.v7_2.remove_in_filter
-frappe.patches.v11_0.drop_column_apply_user_permissions
+execute:frappe.reload_doc('core', 'doctype', 'doctype_action', force=True) #2019-09-23
+execute:frappe.reload_doc('core', 'doctype', 'doctype_link', force=True) #2019-09-23
execute:frappe.reload_doc('core', 'doctype', 'doctype', force=True) #2017-09-22
execute:frappe.reload_doc('core', 'doctype', 'docfield', force=True) #2018-02-20
+frappe.patches.v11_0.drop_column_apply_user_permissions
execute:frappe.reload_doc('core', 'doctype', 'custom_docperm')
execute:frappe.reload_doc('core', 'doctype', 'docperm') #2018-05-29
execute:frappe.reload_doc('core', 'doctype', 'comment')
@@ -257,3 +259,7 @@ frappe.patches.v12_0.setup_tags
frappe.patches.v12_0.update_auto_repeat_status_and_not_submittable
frappe.patches.v12_0.copy_to_parent_for_tags
frappe.patches.v12_0.create_notification_settings_for_user
+frappe.patches.v11_0.make_all_prepared_report_attachments_private #2019-11-26
+execute:frappe.delete_doc("Test Runner")
+frappe.patches.v12_0.setup_email_linking
+frappe.patches.v12_0.fix_home_settings_for_all_users
diff --git a/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py b/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py
new file mode 100644
index 0000000000..f7b9e476a9
--- /dev/null
+++ b/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py
@@ -0,0 +1,26 @@
+from __future__ import unicode_literals
+import frappe
+
+
+def execute():
+ if frappe.db.count("File", filters={"attached_to_doctype": "Prepared Report", "is_private": 0}) > 10000:
+ frappe.db.auto_commit_on_many_writes = True
+
+ files = frappe.get_all("File", fields=["name", "attached_to_name"], filters={"attached_to_doctype": "Prepared Report", "is_private": 0})
+ for file_dict in files:
+ # For some reason Prepared Report doc might not exist, check if it exists first
+ if frappe.db.exists("Prepared Report", file_dict.attached_to_name):
+ try:
+ file_doc = frappe.get_doc("File", file_dict.name)
+ file_doc.is_private = 1
+ file_doc.save()
+ except Exception:
+ # File might not exist on the file system in that case delete both Prepared Report and File doc
+ frappe.delete_doc("Prepared Report", file_dict.attached_to_name)
+ else:
+ # If Prepared Report doc doesn't exist then the file doc is useless. Delete it.
+ frappe.delete_doc("File", file_dict.name)
+
+ if frappe.db.auto_commit_on_many_writes:
+ frappe.db.auto_commit_on_many_writes = False
+
diff --git a/frappe/patches/v12_0/fix_home_settings_for_all_users.py b/frappe/patches/v12_0/fix_home_settings_for_all_users.py
new file mode 100644
index 0000000000..8a6bcca9a0
--- /dev/null
+++ b/frappe/patches/v12_0/fix_home_settings_for_all_users.py
@@ -0,0 +1,41 @@
+import frappe
+from frappe.config import get_modules_from_all_apps_for_user
+import json
+def execute():
+ users = frappe.get_all('User', fields=['name', 'home_settings'])
+
+ for user in users:
+
+ if not user.home_settings:
+ continue
+
+ home_settings = json.loads(user.home_settings)
+
+ modules_by_category = home_settings.get('modules_by_category')
+ if not modules_by_category:
+ continue
+ visible_modules = []
+ category_to_check = []
+
+ for category, modules in modules_by_category.items():
+ visible_modules += modules
+ category_to_check.append(category)
+
+ all_modules = get_modules_from_all_apps_for_user(user.name)
+ all_modules = set([m.get('name') or m.get('module_name') or m.get('label') \
+ for m in all_modules if m.get('category') in category_to_check])
+
+ hidden_modules = home_settings['hidden_modules']
+
+ modules_in_home_settings = set(visible_modules + hidden_modules)
+
+ all_modules = all_modules.union(modules_in_home_settings)
+
+ missing_modules = all_modules - modules_in_home_settings
+
+ if missing_modules:
+ home_settings['hidden_modules'] += missing_modules
+ home_settings = json.dumps(home_settings)
+ frappe.set_value('User', user.name, 'home_settings', home_settings)
+
+ frappe.cache().delete_key('home_settings')
diff --git a/frappe/patches/v12_0/setup_email_linking.py b/frappe/patches/v12_0/setup_email_linking.py
new file mode 100644
index 0000000000..08f57ca5e4
--- /dev/null
+++ b/frappe/patches/v12_0/setup_email_linking.py
@@ -0,0 +1,6 @@
+from __future__ import unicode_literals
+
+from frappe.desk.page.setup_wizard.install_fixtures import setup_email_linking
+
+def execute():
+ setup_email_linking()
\ No newline at end of file
diff --git a/frappe/printing/doctype/letter_head/letter_head.py b/frappe/printing/doctype/letter_head/letter_head.py
index 1a70ebcb08..d75b253dd3 100644
--- a/frappe/printing/doctype/letter_head/letter_head.py
+++ b/frappe/printing/doctype/letter_head/letter_head.py
@@ -4,8 +4,7 @@
from __future__ import unicode_literals
import frappe
from frappe.utils import is_image
-
-
+from frappe import _
from frappe.model.document import Document
class LetterHead(Document):
@@ -43,3 +42,16 @@ class LetterHead(Document):
# update control panel - so it loads new letter directly
frappe.db.set_default("default_letter_head_content", self.content)
+
+ def create_onboarding_docs(self, args):
+ letterhead = args.get('letterhead')
+ if letterhead:
+ try:
+ frappe.get_doc({
+ 'doctype': self.doctype,
+ 'image': letterhead,
+ 'letter_head_name': _('Standard'),
+ 'is_default': 1
+ }).insert()
+ except frappe.NameError:
+ pass
\ No newline at end of file
diff --git a/frappe/printing/doctype/print_format/print_format.json b/frappe/printing/doctype/print_format/print_format.json
index a5d41ee099..951a863776 100644
--- a/frappe/printing/doctype/print_format/print_format.json
+++ b/frappe/printing/doctype/print_format/print_format.json
@@ -1,905 +1,223 @@
{
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 1,
- "autoname": "Prompt",
- "beta": 0,
- "creation": "2013-01-23 19:54:43",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "editable_grid": 0,
- "engine": "InnoDB",
- "fields": [
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fetch_if_empty": 0,
- "fieldname": "doc_type",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "DocType",
- "length": 0,
- "no_copy": 0,
- "options": "DocType",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "module",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Module",
- "length": 0,
- "no_copy": 0,
- "options": "Module Def",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "disabled",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Disabled",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "column_break_3",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "No",
- "fetch_if_empty": 0,
- "fieldname": "standard",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Standard",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "standard",
- "oldfieldtype": "Select",
- "options": "No\nYes",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 1,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "custom_format",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Custom Format",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "custom_format",
- "fetch_if_empty": 0,
- "fieldname": "section_break_6",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "Jinja",
- "depends_on": "custom_format",
- "description": "",
- "fetch_if_empty": 0,
- "fieldname": "print_format_type",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Print Format Type",
- "length": 0,
- "no_copy": 0,
- "options": "Jinja\nJS",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fetch_if_empty": 0,
- "fieldname": "raw_printing",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Raw Printing",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.raw_printing",
- "fetch_if_empty": 0,
- "fieldname": "html",
- "fieldtype": "Code",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "HTML",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "html",
- "oldfieldtype": "Text Editor",
- "options": "HTML",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "raw_printing",
- "description": "Any string-based printer languages can be used. Writing raw commands requires knowledge of the printer's native language provided by the printer manufacturer. Please refer to the developer manual provided by the printer manufacturer on how to write their native commands. These commands are rendered on the server side using the Jinja Templating Language.",
- "fetch_if_empty": 0,
- "fieldname": "raw_commands",
- "fieldtype": "Code",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Raw Commands",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.custom_format",
- "fetch_if_empty": 0,
- "fieldname": "section_break_9",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Style Settings",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "fetch_if_empty": 0,
- "fieldname": "align_labels_right",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Align Labels to the Right",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "fetch_if_empty": 0,
- "fieldname": "show_section_headings",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Show Section Headings",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "fetch_if_empty": 0,
- "fieldname": "line_breaks",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Show Line Breaks after Sections",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "column_break_11",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "default_print_language",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Print Language",
- "length": 0,
- "no_copy": 0,
- "options": "Language",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "Default",
- "depends_on": "eval:!doc.custom_format",
- "fetch_if_empty": 0,
- "fieldname": "font",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Font",
- "length": 0,
- "no_copy": 0,
- "options": "Default\nArial\nHelvetica\nVerdana\nMonospace",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.raw_printing",
- "fetch_if_empty": 0,
- "fieldname": "css_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "css",
- "fieldtype": "Code",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Custom CSS",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "custom_html_help",
- "fieldtype": "HTML",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Custom HTML Help",
- "length": 0,
- "no_copy": 0,
- "options": "
\n
\n
\n
\n\n\t\n\t\t
\n",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "format_data",
- "fieldtype": "Code",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Format Data",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "print_format_builder",
- "fieldtype": "Check",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Print Format Builder",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- }
- ],
- "has_web_view": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-print",
- "idx": 1,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "menu_index": 0,
- "modified": "2019-06-05 12:45:25.869180",
- "modified_by": "Administrator",
- "module": "Printing",
- "name": "Print Format",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
- "write": 1
- }
- ],
- "quick_entry": 0,
- "read_only": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
- }
\ No newline at end of file
+ "allow_rename": 1,
+ "autoname": "Prompt",
+ "creation": "2013-01-23 19:54:43",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+ "doc_type",
+ "module",
+ "disabled",
+ "column_break_3",
+ "standard",
+ "custom_format",
+ "section_break_6",
+ "print_format_type",
+ "raw_printing",
+ "html",
+ "raw_commands",
+ "section_break_9",
+ "align_labels_right",
+ "show_section_headings",
+ "line_breaks",
+ "column_break_11",
+ "default_print_language",
+ "font",
+ "css_section",
+ "css",
+ "custom_html_help",
+ "section_break_13",
+ "print_format_help",
+ "format_data",
+ "print_format_builder"
+ ],
+ "fields": [
+ {
+ "fieldname": "doc_type",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "DocType",
+ "options": "DocType",
+ "reqd": 1
+ },
+ {
+ "fieldname": "module",
+ "fieldtype": "Link",
+ "label": "Module",
+ "options": "Module Def"
+ },
+ {
+ "default": "0",
+ "fieldname": "disabled",
+ "fieldtype": "Check",
+ "label": "Disabled"
+ },
+ {
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break"
+ },
+ {
+ "default": "No",
+ "fieldname": "standard",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Standard",
+ "no_copy": 1,
+ "oldfieldname": "standard",
+ "oldfieldtype": "Select",
+ "options": "No\nYes",
+ "reqd": 1,
+ "search_index": 1
+ },
+ {
+ "default": "0",
+ "fieldname": "custom_format",
+ "fieldtype": "Check",
+ "label": "Custom Format"
+ },
+ {
+ "depends_on": "custom_format",
+ "fieldname": "section_break_6",
+ "fieldtype": "Section Break"
+ },
+ {
+ "default": "Jinja",
+ "depends_on": "custom_format",
+ "fieldname": "print_format_type",
+ "fieldtype": "Select",
+ "label": "Print Format Type",
+ "options": "Jinja\nJS"
+ },
+ {
+ "default": "0",
+ "fieldname": "raw_printing",
+ "fieldtype": "Check",
+ "label": "Raw Printing"
+ },
+ {
+ "depends_on": "eval:!doc.raw_printing",
+ "fieldname": "html",
+ "fieldtype": "Code",
+ "label": "HTML",
+ "oldfieldname": "html",
+ "oldfieldtype": "Text Editor",
+ "options": "HTML"
+ },
+ {
+ "depends_on": "raw_printing",
+ "description": "Any string-based printer languages can be used. Writing raw commands requires knowledge of the printer's native language provided by the printer manufacturer. Please refer to the developer manual provided by the printer manufacturer on how to write their native commands. These commands are rendered on the server side using the Jinja Templating Language.",
+ "fieldname": "raw_commands",
+ "fieldtype": "Code",
+ "label": "Raw Commands"
+ },
+ {
+ "depends_on": "eval:!doc.custom_format",
+ "fieldname": "section_break_9",
+ "fieldtype": "Section Break",
+ "label": "Style Settings"
+ },
+ {
+ "default": "0",
+ "fieldname": "align_labels_right",
+ "fieldtype": "Check",
+ "label": "Align Labels to the Right"
+ },
+ {
+ "default": "0",
+ "fieldname": "show_section_headings",
+ "fieldtype": "Check",
+ "label": "Show Section Headings"
+ },
+ {
+ "default": "0",
+ "fieldname": "line_breaks",
+ "fieldtype": "Check",
+ "label": "Show Line Breaks after Sections"
+ },
+ {
+ "fieldname": "column_break_11",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "default_print_language",
+ "fieldtype": "Link",
+ "label": "Default Print Language",
+ "options": "Language"
+ },
+ {
+ "default": "Default",
+ "depends_on": "eval:!doc.custom_format",
+ "fieldname": "font",
+ "fieldtype": "Select",
+ "label": "Font",
+ "options": "Default\nArial\nHelvetica\nVerdana\nMonospace"
+ },
+ {
+ "depends_on": "eval:!doc.raw_printing",
+ "fieldname": "css_section",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "css",
+ "fieldtype": "Code",
+ "label": "Custom CSS",
+ "options": "CSS"
+ },
+ {
+ "fieldname": "custom_html_help",
+ "fieldtype": "HTML",
+ "label": "Custom HTML Help",
+ "options": "
\n
\n
\n
\n\n\t\n\t\t
\n"
+ },
+ {
+ "fieldname": "format_data",
+ "fieldtype": "Code",
+ "hidden": 1,
+ "label": "Format Data"
+ },
+ {
+ "default": "0",
+ "fieldname": "print_format_builder",
+ "fieldtype": "Check",
+ "hidden": 1,
+ "label": "Print Format Builder"
+ }
+ ],
+ "icon": "fa fa-print",
+ "idx": 1,
+ "modified": "2019-11-28 12:40:40.364699",
+ "modified_by": "faris@erpnext.com",
+ "module": "Printing",
+ "name": "Print Format",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "share": 1,
+ "write": 1
+ }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/printing/onboarding_slide/company_letter_head/company_letter_head.json b/frappe/printing/onboarding_slide/company_letter_head/company_letter_head.json
new file mode 100644
index 0000000000..2f51d2e18a
--- /dev/null
+++ b/frappe/printing/onboarding_slide/company_letter_head/company_letter_head.json
@@ -0,0 +1,36 @@
+{
+ "add_more_button": 0,
+ "app": "ERPNext",
+ "creation": "2019-11-22 13:25:42.892593",
+ "docstatus": 0,
+ "doctype": "Onboarding Slide",
+ "domains": [],
+ "help_links": [
+ {
+ "label": "Need Help?",
+ "video_id": "cKZHcx1znMc"
+ }
+ ],
+ "idx": 0,
+ "image_src": "/assets/erpnext/images/illustrations/letterhead-onboard.png",
+ "max_count": 0,
+ "modified": "2019-12-03 22:54:57.618989",
+ "modified_by": "Administrator",
+ "name": "Company Letter Head",
+ "owner": "Administrator",
+ "ref_doctype": "Letter Head",
+ "slide_desc": "
`));
+ if(this.help) this.$content.append($(``));
this.reqd_fields = [];
@@ -69,20 +72,22 @@ frappe.ui.Slide = class Slide {
this.set_reqd_fields();
}
+ setup_done_state() {}
+
// Form methods
get_atomic_fields() {
var fields = JSON.parse(JSON.stringify(this.fields));
if(this.add_more) {
this.count = 1;
fields = fields.map((field, i) => {
- if(field.fieldname) {
+ if (field.fieldname) {
field.fieldname += '_1';
}
- if(i === 1 && this.mandatory_entry) {
+ if (i === 1 && this.mandatory_entry) {
field.reqd = 1;
}
- if(!field.static) {
- if(field.label) field.label += ' 1';
+ if (!field.static) {
+ if (field.label) field.label;
}
return field;
});
@@ -102,10 +107,10 @@ frappe.ui.Slide = class Slide {
set_values() {
this.values = this.form.get_values();
- if(this.values===null) {
+ if (this.values===null) {
return false;
}
- if(this.validate && !this.validate()) {
+ if (this.validate && !this.validate()) {
return false;
}
return true;
@@ -117,13 +122,16 @@ frappe.ui.Slide = class Slide {
.on('click', () => {
this.count++;
var fields = JSON.parse(JSON.stringify(this.fields));
+
this.form.add_fields(fields.map(field => {
- if(field.fieldname) field.fieldname += '_' + this.count;
- if(!field.static) {
- if(field.label) field.label += ' ' + this.count;
+ if (field.fieldname) field.fieldname += '_' + this.count;
+ if (!field.static) {
+ if (field.label) field.label;
}
+ field.reqd = 0;
return field;
}));
+
if(this.count === this.max_count) {
this.$more.addClass('hide');
}
@@ -151,7 +159,7 @@ frappe.ui.Slide = class Slide {
var empty_fields = this.reqd_fields.filter((field) => {
return !field.get_value();
});
- if(empty_fields.length) {
+ if (empty_fields.length) {
this.slides_footer.find('.action').addClass('disabled');
} else {
this.slides_footer.find('.action').removeClass('disabled');
@@ -163,11 +171,18 @@ frappe.ui.Slide = class Slide {
}
bind_primary_action() {
- this.slides_footer.find(".primary").on('click', () => {
+ this.slides_footer.find(".primary").on('click.primary_action', () => {
this.primary_action();
});
}
+ is_last_slide() {
+ if (this.id === this.parent[0].children.length-1) {
+ return true;
+ }
+ return false;
+ }
+
before_show() { }
show_slide() {
diff --git a/frappe/public/js/frappe/ui/tags.js b/frappe/public/js/frappe/ui/tags.js
index f549aaae5c..d6c85bb043 100644
--- a/frappe/public/js/frappe/ui/tags.js
+++ b/frappe/public/js/frappe/ui/tags.js
@@ -34,13 +34,17 @@ frappe.ui.Tags = class {
}
bind() {
+ const me = this;
+ const select_tag = function() {
+ const tagValue = frappe.utils.xss_sanitise(me.$input.val());
+ me.addTag(tagValue);
+ me.$input.val('');
+ }
+
this.$input.keypress((e) => {
- if(e.which == 13 || e.keyCode == 13) {
- const tagValue = frappe.utils.xss_sanitise(this.$input.val());
- this.addTag(tagValue);
- this.$input.val('');
- }
+ if (e.which == 13 || e.keyCode == 13) select_tag();
});
+ this.$input.focusout(select_tag);
this.$input.on('blur', () => {
this.deactivate();
diff --git a/frappe/public/js/frappe/ui/toolbar/search.js b/frappe/public/js/frappe/ui/toolbar/search.js
index acc623fa20..042eefc316 100644
--- a/frappe/public/js/frappe/ui/toolbar/search.js
+++ b/frappe/public/js/frappe/ui/toolbar/search.js
@@ -302,10 +302,16 @@ frappe.search.SearchDialog = Class.extend({
return link;
}
- if(result.image) {
- $result.append('
');
+ if (result.image) {
+ $result.append(`
+
Custom CSS Help
\n\nNotes:
\n\n- \n
- All field groups (label + value) are set attributes
data-fieldtypeanddata-fieldname\n - All values are given class
value\n - All Section Breaks are given class
section-break\n - All Column Breaks are given class
column-break\n
Examples
\n\n1. Left align integers
\n\n[data-fieldtype=\"Int\"] .value { text-left: left; }1. Add border to sections except the last section
\n\n.section-break { padding: 30px 0px; border-bottom: 1px solid #eee; }\n.section-break:last-child { padding-bottom: 0px; border-bottom: 0px; }Print Format Help
\n\n
Introduction
\nPrint itemsFormats are rendered on the server side using the Jinja Templating Language. All forms have access to the doc object which contains information about the document that is being formatted. You can also access common utilities via the frappe module.
For styling, the Boostrap CSS framework is provided and you can enjoy the full range of classes.
\n\n
References
\n\n\n
Example
\n<h3>{{ doc.select_print_heading or \"Invoice\" }}</h3>\n<div class=\"row\">\n\t<div class=\"col-md-3 text-right\">Customer Name</div>\n\t<div class=\"col-md-9\">{{ doc.customer_name }}</div>\n</div>\n<div class=\"row\">\n\t<div class=\"col-md-3 text-right\">Date</div>\n\t<div class=\"col-md-9\">{{ doc.get_formatted(\"invoice_date\") }}</div>\n</div>\n<table class=\"table table-bordered\">\n\t<tbody>\n\t\t<tr>\n\t\t\t<th>Sr</th>\n\t\t\t<th>Item Name</th>\n\t\t\t<th>Description</th>\n\t\t\t<th class=\"text-right\">Qty</th>\n\t\t\t<th class=\"text-right\">Rate</th>\n\t\t\t<th class=\"text-right\">Amount</th>\n\t\t</tr>\n\t\t{%- for row in doc.items -%}\n\t\t<tr>\n\t\t\t<td style=\"width: 3%;\">{{ row.idx }}</td>\n\t\t\t<td style=\"width: 20%;\">\n\t\t\t\t{{ row.item_name }}\n\t\t\t\t{% if row.item_code != row.item_name -%}\n\t\t\t\t<br>Item Code: {{ row.item_code}}\n\t\t\t\t{%- endif %}\n\t\t\t</td>\n\t\t\t<td style=\"width: 37%;\">\n\t\t\t\t<div style=\"border: 0px;\">{{ row.description }}</div></td>\n\t\t\t<td style=\"width: 10%; text-align: right;\">{{ row.qty }} {{ row.uom or row.stock_uom }}</td>\n\t\t\t<td style=\"width: 15%; text-align: right;\">{{\n\t\t\t\trow.get_formatted(\"rate\", doc) }}</td>\n\t\t\t<td style=\"width: 15%; text-align: right;\">{{\n\t\t\t\trow.get_formatted(\"amount\", doc) }}</td>\n\t\t</tr>\n\t\t{%- endfor -%}\n\t</tbody>\n</table>\n
Common Functions
\ndoc.get_formatted(\"[fieldname]\", [parent_doc]) | \n\t\t\tGet document value formatted as Date, Currency etc. Pass parent doc for curreny type fields. | \n\t\t
frappe.db.get_value(\"[doctype]\", \"[name]\", \"fieldname\") | \n\t\t\tGet value from another document. | \n\t\t
Custom CSS Help
\n\nNotes:
\n\n- \n
- All field groups (label + value) are set attributes
data-fieldtypeanddata-fieldname\n - All values are given class
value\n - All Section Breaks are given class
section-break\n - All Column Breaks are given class
column-break\n
Examples
\n\n1. Left align integers
\n\n[data-fieldtype=\"Int\"] .value { text-left: left; }1. Add border to sections except the last section
\n\n.section-break { padding: 30px 0px; border-bottom: 1px solid #eee; }\n.section-break:last-child { padding-bottom: 0px; border-bottom: 0px; }Print Format Help
\n\n
Introduction
\nPrint itemsFormats are rendered on the server side using the Jinja Templating Language. All forms have access to the doc object which contains information about the document that is being formatted. You can also access common utilities via the frappe module.
For styling, the Boostrap CSS framework is provided and you can enjoy the full range of classes.
\n\n
References
\n\n\n
Example
\n<h3>{{ doc.select_print_heading or \"Invoice\" }}</h3>\n<div class=\"row\">\n\t<div class=\"col-md-3 text-right\">Customer Name</div>\n\t<div class=\"col-md-9\">{{ doc.customer_name }}</div>\n</div>\n<div class=\"row\">\n\t<div class=\"col-md-3 text-right\">Date</div>\n\t<div class=\"col-md-9\">{{ doc.get_formatted(\"invoice_date\") }}</div>\n</div>\n<table class=\"table table-bordered\">\n\t<tbody>\n\t\t<tr>\n\t\t\t<th>Sr</th>\n\t\t\t<th>Item Name</th>\n\t\t\t<th>Description</th>\n\t\t\t<th class=\"text-right\">Qty</th>\n\t\t\t<th class=\"text-right\">Rate</th>\n\t\t\t<th class=\"text-right\">Amount</th>\n\t\t</tr>\n\t\t{%- for row in doc.items -%}\n\t\t<tr>\n\t\t\t<td style=\"width: 3%;\">{{ row.idx }}</td>\n\t\t\t<td style=\"width: 20%;\">\n\t\t\t\t{{ row.item_name }}\n\t\t\t\t{% if row.item_code != row.item_name -%}\n\t\t\t\t<br>Item Code: {{ row.item_code}}\n\t\t\t\t{%- endif %}\n\t\t\t</td>\n\t\t\t<td style=\"width: 37%;\">\n\t\t\t\t<div style=\"border: 0px;\">{{ row.description }}</div></td>\n\t\t\t<td style=\"width: 10%; text-align: right;\">{{ row.qty }} {{ row.uom or row.stock_uom }}</td>\n\t\t\t<td style=\"width: 15%; text-align: right;\">{{\n\t\t\t\trow.get_formatted(\"rate\", doc) }}</td>\n\t\t\t<td style=\"width: 15%; text-align: right;\">{{\n\t\t\t\trow.get_formatted(\"amount\", doc) }}</td>\n\t\t</tr>\n\t\t{%- endfor -%}\n\t</tbody>\n</table>\n
Common Functions
\ndoc.get_formatted(\"[fieldname]\", [parent_doc]) | \n\t\t\tGet document value formatted as Date, Currency etc. Pass parent doc for curreny type fields. | \n\t\t
frappe.db.get_value(\"[doctype]\", \"[name]\", \"fieldname\") | \n\t\t\tGet value from another document. | \n\t\t
The letter head will appear across all print formats and PDFs
\nKeep it web friendly as 1024px by 128px
", + "slide_fields": [ + { + "align": "center", + "fieldname": "letterhead", + "fieldtype": "Attach Image", + "label": "Attach Letterhead", + "options": "image", + "reqd": 0 + } + ], + "slide_order": 20, + "slide_title": "Company Letter Head", + "slide_type": "Create" +} \ No newline at end of file diff --git a/frappe/printing/page/print_format_builder/print_format_builder.js b/frappe/printing/page/print_format_builder/print_format_builder.js index 8605fb762e..f9bb524d54 100644 --- a/frappe/printing/page/print_format_builder/print_format_builder.js +++ b/frappe/printing/page/print_format_builder/print_format_builder.js @@ -695,7 +695,8 @@ frappe.PrintFormatBuilder = Class.extend({ { fieldname: "content", fieldtype: "Code", - label: label + label: label, + options: "HTML" }, { fieldname: "help", diff --git a/frappe/public/build.json b/frappe/public/build.json index 32a2cfd223..76d6d74563 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -148,6 +148,7 @@ "public/js/frappe/ui/page.html", "public/js/frappe/ui/page.js", "public/js/frappe/ui/slides.js", + "public/js/frappe/ui/onboarding_dialog.js", "public/js/frappe/ui/find.js", "public/js/frappe/ui/iconbar.js", "public/js/frappe/form/layout.js", diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css index 8e43be12ea..6ddf93df6a 100644 --- a/frappe/public/css/desk.css +++ b/frappe/public/css/desk.css @@ -1158,16 +1158,6 @@ input[type="checkbox"]:focus { color: #fff; border-color: #b1bdca; } -.user-progress-dialog .slides-progress { +.onboarding-dialog .slides-progress { margin-top: 15px; } -.user-progress-dialog .done-state .check-container { - font-size: 64px; - margin: 40px; -} -.user-progress-dialog .done-state .title { - font-weight: normal; -} -.user-progress-dialog .done-state .help-links a { - margin: 0px 10px; -} diff --git a/frappe/public/images/ui-states/empty.png b/frappe/public/images/ui-states/empty.png new file mode 100644 index 0000000000..de2a893508 Binary files /dev/null and b/frappe/public/images/ui-states/empty.png differ diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 4fbea6684f..92194acdca 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -88,6 +88,9 @@ frappe.Application = Class.extend({ } this.show_update_available(); + if (frappe.boot.is_first_startup) { + this.setup_onboarding_wizard(); + } if(frappe.ui.startup_setup_dialog && !frappe.boot.setup_complete) { frappe.ui.startup_setup_dialog.pre_show(); @@ -482,6 +485,20 @@ frappe.Application = Class.extend({ }); }, + setup_onboarding_wizard: () => { + frappe.call('frappe.desk.doctype.onboarding_slide.onboarding_slide.get_onboarding_slides').then(res => { + if (res.message) { + let slides = res.message; + if (slides.length) { + this.progress_dialog = new frappe.setup.OnboardingDialog({ + slides: slides + }); + this.progress_dialog.show(); + } + } + }); + }, + setup_analytics: function() { if(window.mixpanel) { window.mixpanel.identify(frappe.session.user); diff --git a/frappe/public/js/frappe/form/controls/autocomplete.js b/frappe/public/js/frappe/form/controls/autocomplete.js index 026cdbec25..0b31776caf 100644 --- a/frappe/public/js/frappe/form/controls/autocomplete.js +++ b/frappe/public/js/frappe/form/controls/autocomplete.js @@ -10,13 +10,7 @@ frappe.ui.form.ControlAutocomplete = frappe.ui.form.ControlData.extend({ set_options() { if (this.df.options) { let options = this.df.options || []; - if (typeof options === 'string') { - options = options.split('\n'); - } - if (typeof options[0] === 'string') { - options = options.map(o => ({ label: o, value: o })); - } - this._data = options; + this._data = this.parse_options(options); } }, @@ -100,6 +94,9 @@ frappe.ui.form.ControlAutocomplete = frappe.ui.form.ControlData.extend({ }, validate(value) { + if (this.df.ignore_validation) { + return value || ''; + } let valid_values = this.awesomplete._list.map(d => d.value); if (!valid_values.length) { return value; @@ -111,11 +108,22 @@ frappe.ui.form.ControlAutocomplete = frappe.ui.form.ControlData.extend({ } }, + parse_options(options) { + if (typeof options === 'string') { + options = options.split('\n'); + } + if (typeof options[0] === 'string') { + options = options.map(o => ({ label: o, value: o })); + } + return options; + }, + get_data() { return this._data || []; }, set_data(data) { + data = this.parse_options(data); if (this.awesomplete) { this.awesomplete.list = data; } diff --git a/frappe/public/js/frappe/form/controls/comment.js b/frappe/public/js/frappe/form/controls/comment.js index eba82fd7b2..a64df56bca 100644 --- a/frappe/public/js/frappe/form/controls/comment.js +++ b/frappe/public/js/frappe/form/controls/comment.js @@ -1,7 +1,7 @@ import Quill from 'quill'; import Mention from './quill-mention/quill.mention'; -Quill.register('modules/mention', Mention); +Quill.register('modules/mention', Mention, true); frappe.ui.form.ControlComment = frappe.ui.form.ControlTextEditor.extend({ make_wrapper() { diff --git a/frappe/public/js/frappe/form/controls/currency.js b/frappe/public/js/frappe/form/controls/currency.js index 196ae5fd43..5a50ad9de6 100644 --- a/frappe/public/js/frappe/form/controls/currency.js +++ b/frappe/public/js/frappe/form/controls/currency.js @@ -1,29 +1,9 @@ frappe.ui.form.ControlCurrency = frappe.ui.form.ControlFloat.extend({ - eval_expression: function(value) { - if (typeof value ==='string' && value.match(/^[0-9+-/* ]+$/)) { - // Removes seperator - value = strip_number_groups(value, this.get_number_format()); - - try { - return eval(value); - } catch (e) { - return value; - } - } - // If not string - return value; - }, - format_for_input: function(value) { - var formatted_value = format_number(parseFloat(value), this.get_number_format(), this.get_precision()); + var formatted_value = format_number(value, this.get_number_format(), this.get_precision()); return isNaN(parseFloat(value)) ? "" : formatted_value; }, - get_number_format: function() { - var currency = frappe.meta.get_field_currency(this.df, this.get_doc()); - return get_number_format(currency); - }, - get_precision: function() { // always round based on field precision or currency's precision // this method is also called in this.parse() diff --git a/frappe/public/js/frappe/form/controls/float.js b/frappe/public/js/frappe/form/controls/float.js index d32f29e28a..027cfebc2a 100644 --- a/frappe/public/js/frappe/form/controls/float.js +++ b/frappe/public/js/frappe/form/controls/float.js @@ -1,10 +1,7 @@ frappe.ui.form.ControlFloat = frappe.ui.form.ControlInt.extend({ parse: function(value) { value = this.eval_expression(value); - return isNaN(parseFloat(value)) ? null : flt(value, this.get_precision(), - // While parsing currency, get_number_format passes currency's number_format - // In case of parsing float, it passes global number_format - this.get_number_format()); + return isNaN(parseFloat(value)) ? null : flt(value, this.get_precision()); }, format_for_input: function(value) { @@ -12,13 +9,13 @@ frappe.ui.form.ControlFloat = frappe.ui.form.ControlInt.extend({ if (this.df.fieldtype==="Float" && this.df.options && this.df.options.trim()) { number_format = this.get_number_format(); } - var formatted_value = format_number(parseFloat(value), number_format, this.get_precision()); + var formatted_value = format_number(value, number_format, this.get_precision()); return isNaN(parseFloat(value)) ? "" : formatted_value; }, get_number_format: function() { - // In case of 'Float' field currency's number_format shouldn't be used for formatting - return get_number_format(); + var currency = frappe.meta.get_field_currency(this.df, this.get_doc()); + return get_number_format(currency); }, get_precision: function() { diff --git a/frappe/public/js/frappe/form/controls/int.js b/frappe/public/js/frappe/form/controls/int.js index ead48a996c..5639e5f132 100644 --- a/frappe/public/js/frappe/form/controls/int.js +++ b/frappe/public/js/frappe/form/controls/int.js @@ -20,20 +20,18 @@ frappe.ui.form.ControlInt = frappe.ui.form.ControlData.extend({ }); }, eval_expression: function(value) { - if (typeof value==='string' - && value.match(/^[0-9+-/* ]+$/) - // strings with commas are evaluated incorrectly - // for e.g 47,186.00 -> 186 - && !value.includes(',')) { - try { - return eval(value); - } catch (e) { - // bad expression - return value; + if (typeof value === 'string') { + if (value.match(/^[0-9\+\-\/\* ]+$/)) { + // If it is a string containing operators + try { + return eval(value); + } catch (e) { + // bad expression + return value; + } } - } else { - return value; } + return value; }, parse: function(value) { return cint(this.eval_expression(value), null); diff --git a/frappe/public/js/frappe/form/controls/multiselect_list.js b/frappe/public/js/frappe/form/controls/multiselect_list.js index 0313ee70d7..3e8dc21dca 100644 --- a/frappe/public/js/frappe/form/controls/multiselect_list.js +++ b/frappe/public/js/frappe/form/controls/multiselect_list.js @@ -17,6 +17,7 @@ frappe.ui.form.ControlMultiSelectList = frappe.ui.form.ControlData.extend({ this.$list_wrapper = $(template); this.$input = $(''); + this.input = this.$input.get(0); this.$list_wrapper.prependTo(this.input_area); this.$filter_input = this.$list_wrapper.find('input'); this.$list_wrapper.on('click', '.dropdown-menu', e => { diff --git a/frappe/public/js/frappe/form/controls/quill-mention/blots/mention.js b/frappe/public/js/frappe/form/controls/quill-mention/blots/mention.js index 26485adcc0..1c5787f854 100644 --- a/frappe/public/js/frappe/form/controls/quill-mention/blots/mention.js +++ b/frappe/public/js/frappe/form/controls/quill-mention/blots/mention.js @@ -35,4 +35,4 @@ MentionBlot.blotName = 'mention'; MentionBlot.tagName = 'span'; MentionBlot.className = 'mention'; -Quill.register(MentionBlot); +Quill.register(MentionBlot, true); diff --git a/frappe/public/js/frappe/form/controls/quill-mention/quill.mention.js b/frappe/public/js/frappe/form/controls/quill-mention/quill.mention.js index 0b50ffd758..80ee5a6c6d 100644 --- a/frappe/public/js/frappe/form/controls/quill-mention/quill.mention.js +++ b/frappe/public/js/frappe/form/controls/quill-mention/quill.mention.js @@ -361,6 +361,6 @@ class Mention { } } -Quill.register('modules/mention', Mention); +Quill.register('modules/mention', Mention, true); export default Mention; diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js index 1b9078ae03..b35c92c1ae 100644 --- a/frappe/public/js/frappe/form/controls/text_editor.js +++ b/frappe/public/js/frappe/form/controls/text_editor.js @@ -36,7 +36,7 @@ class MyLink extends Link { } } -Quill.register(MyLink); +Quill.register(MyLink, true); // image uploader const Uploader = Quill.import('modules/uploader'); diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 5a983986d8..2f30228aff 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -111,6 +111,7 @@ frappe.ui.form.Form = class FrappeForm { $("body").attr("data-sidebar", 1); } this.setup_file_drop(); + this.setup_doctype_actions(); this.setup_done = true; } @@ -319,6 +320,29 @@ frappe.ui.form.Form = class FrappeForm { } } + // sets up the refresh event for custom buttons + // added via configuration + setup_doctype_actions() { + if (this.meta.actions) { + for (let action of this.meta.actions) { + frappe.ui.form.on(this.doctype, 'refresh', () => { + if (!this.is_new()) { + this.add_custom_button(action.label, () => { + if (action.action_type==='Server Action') { + frappe.xcall(action.action, {doc: this.doc}).then(() => { + frappe.msgprint({ + message: __('{} Complete', [action.label]), + alert: true + }); + }); + } + }, action.group); + } + }); + } + } + } + switch_doc(docname) { // record switch if(this.docname != docname && (!this.meta.in_dialog || this.in_form) && !this.meta.istable) { @@ -328,7 +352,11 @@ frappe.ui.form.Form = class FrappeForm { } } // reset visible columns, since column headings can change in different docs - this.grids.forEach(grid_obj => grid_obj.grid.visible_columns = null); + this.grids.forEach(grid_obj => { + grid_obj.grid.visible_columns = null + // reset page number to 1 + grid_obj.grid.grid_pagination.go_to_page(1); + }); frappe.ui.form.close_grid_form(); this.docname = docname; } diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 3de62daf64..6da742638a 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -2,6 +2,7 @@ // MIT License. See license.txt import GridRow from "./grid_row"; +import GridPagination from './grid_pagination'; frappe.ui.form.get_open_grid_form = function() { return $(".grid-row-open").data("grid_row"); @@ -47,8 +48,8 @@ export default class Grid { return false; } } + make() { - var me = this; let template = `
@@ -63,25 +64,38 @@ export default class Grid {
- {{__('No user found')}}
diff --git a/frappe/public/js/frappe/ui/onboarding_dialog.js b/frappe/public/js/frappe/ui/onboarding_dialog.js
new file mode 100644
index 0000000000..962cf988e8
--- /dev/null
+++ b/frappe/public/js/frappe/ui/onboarding_dialog.js
@@ -0,0 +1,158 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+frappe.provide("frappe.setup");
+frappe.provide("frappe.ui");
+
+frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide {
+ constructor(slide = null) {
+ super(slide);
+ }
+
+ make() {
+ super.make();
+ this.$next_btn = this.slides_footer.find('.next-btn');
+ this.$complete_btn = this.slides_footer.find('.complete-btn');
+ this.$action_button = this.slides_footer.find('.next-btn');
+ if (this.help_links) {
+ this.$help_links = $(`
`).appendTo(this.$wrapper);
@@ -34,10 +36,11 @@ frappe.ui.Slide = class Slide {
this.$content = this.$body.find(".content");
this.$form = this.$body.find(".form");
this.$primary_btn = this.slides_footer.find('.primary');
+ this.$form_wrapper = this.$body.find(".form-wrapper");
- if(this.help) this.$content.append($(``));
if(this.image_src) this.$content.append(
$(`
+
- {
+ row.columns_list.forEach( column => {
//Hide the column specified
if (column.df.fieldname == fieldname) {
if (show) {
@@ -433,27 +507,33 @@ export default class Grid {
this.refresh();
}
+
toggle_reqd(fieldname, reqd) {
this.get_docfield(fieldname).reqd = reqd;
this.refresh();
}
+
toggle_enable(fieldname, enable) {
this.get_docfield(fieldname).read_only = enable ? 0 : 1;
this.refresh();
}
+
toggle_display(fieldname, show) {
this.get_docfield(fieldname).hidden = show ? 0 : 1;
this.refresh();
}
+
toggle_checkboxes(enable) {
this.wrapper.find(".grid-row-check").prop('disabled', !enable)
}
+
get_docfield(fieldname) {
return frappe.meta.get_docfield(this.doctype, fieldname, this.frm ? this.frm.docname : null);
}
+
get_row(key) {
- if(typeof key == 'number') {
- if(key < 0) {
+ if (typeof key == 'number') {
+ if (key < 0) {
return this.grid_rows[this.grid_rows.length + key];
} else {
return this.grid_rows[key];
@@ -462,9 +542,11 @@ export default class Grid {
return this.grid_rows_by_docname[key];
}
}
+
get_grid_row(key) {
return this.get_row(key);
}
+
get_field(fieldname) {
// Note: workaround for get_query
if(!this.fieldinfo[fieldname])
@@ -472,16 +554,30 @@ export default class Grid {
}
return this.fieldinfo[fieldname];
}
+
set_value(fieldname, value, doc) {
if(this.display_status!=="None" && this.grid_rows_by_docname[doc.name]) {
this.grid_rows_by_docname[doc.name].refresh_field(fieldname, value);
}
}
- add_new_row(idx, callback, show, copy_doc) {
- if(this.is_editable()) {
- if(this.frm) {
+
+ setup_add_row() {
+ this.wrapper.find(".grid-add-row").click(() => {
+ this.add_new_row(null, null, true, null, true);
+ this.set_focus_on_row();
+
+ return false;
+ });
+ }
+
+ add_new_row(idx, callback, show, copy_doc, go_to_last_page=false) {
+ if (this.is_editable()) {
+ if (go_to_last_page) {
+ this.grid_pagination.go_to_last_page_to_add_row();
+ }
+ if (this.frm) {
var d = frappe.model.add_child(this.frm.doc, this.df.options, this.df.fieldname, idx);
- if(copy_doc) {
+ if (copy_doc) {
d = this.duplicate_row(d, copy_doc);
}
d.__unedited = true;
@@ -495,13 +591,13 @@ export default class Grid {
this.refresh();
}
- if(show) {
- if(idx) {
+ if (show) {
+ if (idx) {
// always open inserted rows
this.wrapper.find("[data-idx='"+idx+"']").data("grid_row")
.toggle_view(true, callback);
} else {
- if(!this.allow_on_grid_editing()) {
+ if (!this.allow_on_grid_editing()) {
// open last row only if on-grid-editing is disabled
this.wrapper.find(".grid-row:last").data("grid_row")
.toggle_view(true, callback);
@@ -515,21 +611,18 @@ export default class Grid {
renumber_based_on_dom() {
// renumber based on dom
- let me = this;
- let $rows = $(me.parent).find(".rows");
-
- me.grid_rows = [];
- me.frm.doc[me.df.fieldname] = [];
-
- $rows.find(".grid-row").each(function(i, item) {
+ let $rows = $(this.parent).find(".rows");
+ $rows.find(".grid-row").each( (i, item) => {
let $item = $(item);
- let d = locals[me.doctype][$item.attr('data-name')];
- d.idx = i + 1;
+ let index = (this.grid_pagination.page_index-1)*this.grid_pagination.page_length+i;
+ let d = locals[this.doctype][$item.attr('data-name')];
+ d.idx = index + 1;
$item.attr('data-idx', d.idx);
- me.frm.doc[me.df.fieldname].push(d);
- me.grid_rows.push(me.grid_rows_by_docname[d.name]);
+ this.frm.doc[this.df.fieldname][index] = (d);
+ this.data[index] = d;
+ this.grid_rows[index]=(this.grid_rows_by_docname[d.name]);
});
}
@@ -545,12 +638,11 @@ export default class Grid {
}
set_focus_on_row(idx) {
- var me = this;
if(!idx) {
- idx = me.grid_rows.length - 1;
+ idx = this.grid_rows.length - 1;
}
- setTimeout(function() {
- me.grid_rows[idx].row
+ setTimeout(() => {
+ this.grid_rows[idx].row
.find('input[type="Text"],textarea,select').filter(':visible:first').focus();
}, 100);
}
@@ -563,23 +655,22 @@ export default class Grid {
this.visible_columns = [];
- for(var ci in fields) {
+ for (var ci in fields) {
var _df = fields[ci];
// get docfield if from fieldname
df = this.fields_map[_df.fieldname];
- if(!df.hidden
+ if (!df.hidden
&& (this.editable_fields || df.in_list_view)
&& (this.frm && this.frm.get_perm(df.permlevel, "read") || !this.frm)
&& !in_list(frappe.model.layout_fields, df.fieldtype)) {
- if(df.columns) {
+ if (df.columns) {
df.colsize=df.columns;
- }
- else {
+ } else {
var colsize = 2;
- switch(df.fieldtype) {
+ switch (df.fieldtype) {
case "Text":
case "Small Text": colsize = 3; break;
case "Check": colsize = 1;
@@ -596,7 +687,7 @@ export default class Grid {
}
total_colsize += df.colsize;
- if(total_colsize > 11)
+ if (total_colsize > 11)
return false;
this.visible_columns.push([df, df.colsize]);
}
@@ -604,11 +695,11 @@ export default class Grid {
// redistribute if total-col size is less than 12
var passes = 0;
- while(total_colsize < 11 && passes < 12) {
- for(var i in this.visible_columns) {
+ while (total_colsize < 11 && passes < 12) {
+ for (var i in this.visible_columns) {
var df = this.visible_columns[i][0];
var colsize = this.visible_columns[i][1];
- if(colsize > 1 && colsize < 11
+ if (colsize > 1 && colsize < 11
&& !in_list(frappe.model.std_fields_list, df.fieldname)) {
if (passes < 3 && ["Int", "Currency", "Float", "Check", "Percent"].indexOf(df.fieldtype)!==-1) {
@@ -620,7 +711,7 @@ export default class Grid {
total_colsize++;
}
- if(total_colsize > 10)
+ if (total_colsize > 10)
break;
}
passes++;
@@ -631,18 +722,21 @@ export default class Grid {
is_editable() {
return this.display_status=="Write" && !this.static_rows;
}
+
is_sortable() {
return this.sortable_status || this.is_editable();
}
+
only_sortable(status) {
- if(status===undefined ? true : status) {
+ if (status===undefined ? true : status) {
this.sortable_status = true;
this.static_rows = true;
}
}
+
set_multiple_add(link, qty) {
- if(this.multiple_set) return;
- var me = this;
+ if (this.multiple_set) return;
+
var link_field = frappe.meta.get_docfield(this.df.options, link);
var btn = $(this.wrapper).find(".grid-add-multiple-rows");
@@ -650,27 +744,29 @@ export default class Grid {
btn.removeClass('hidden');
// open link selector on click
- btn.on("click", function() {
+ btn.on("click", () => {
new frappe.ui.form.LinkSelector({
doctype: link_field.options,
fieldname: link,
qty_fieldname: qty,
- target: me,
+ target: this,
txt: ""
});
+ this.grid_pagination.go_to_last_page_to_add_row();
return false;
});
this.multiple_set = true;
}
+
setup_allow_bulk_edit() {
- var me = this;
- if(this.frm && this.frm.get_docfield(this.df.fieldname).allow_bulk_edit) {
+ let me = this;
+ if (this.frm && this.frm.get_docfield(this.df.fieldname).allow_bulk_edit) {
// download
- me.setup_download();
+ this.setup_download();
// upload
frappe.flags.no_socketio = true;
- $(this.wrapper).find(".grid-upload").removeClass('hidden').on("click", function() {
+ $(this.wrapper).find(".grid-upload").removeClass('hidden').on("click", () => {
new frappe.ui.FileUploader({
as_dataurl: true,
allow_multiple: false,
@@ -678,30 +774,29 @@ export default class Grid {
var data = frappe.utils.csv_to_array(frappe.utils.get_decoded_string(file.dataurl));
// row #2 contains fieldnames;
var fieldnames = data[2];
-
me.frm.clear_table(me.df.fieldname);
- $.each(data, function(i, row) {
- if(i > 6) {
+ $.each(data, (i, row) => {
+ if (i > 6) {
var blank_row = true;
$.each(row, function(ci, value) {
- if(value) {
+ if (value) {
blank_row = false;
return false;
}
});
- if(!blank_row) {
+ if (!blank_row) {
var d = me.frm.add_child(me.df.fieldname);
- $.each(row, function(ci, value) {
+ $.each(row, (ci, value) => {
var fieldname = fieldnames[ci];
var df = frappe.meta.get_docfield(me.df.options, fieldname);
// convert date formatting
- if(df.fieldtype==="Date" && value) {
+ if (df.fieldtype==="Date" && value) {
value = frappe.datetime.user_to_str(value);
}
- if(df.fieldtype==="Int" || df.fieldtype==="Check") {
+ if (df.fieldtype==="Int" || df.fieldtype==="Check") {
value = cint(value);
}
@@ -712,17 +807,17 @@ export default class Grid {
});
me.frm.refresh_field(me.df.fieldname);
- frappe.msgprint({message:__('Table updated'), title:__('Success'), indicator:'green'})
+ frappe.msgprint({message: __('Table updated'), title: __('Success'), indicator: 'green'});
}
});
return false;
});
}
}
+
setup_download() {
- var me = this;
- let title = me.df.label || frappe.model.unscrub(me.df.fieldname);
- $(this.wrapper).find(".grid-download").removeClass('hidden').on("click", function() {
+ let title = this.df.label || frappe.model.unscrub(this.df.fieldname);
+ $(this.wrapper).find(".grid-download").removeClass('hidden').on("click", () => {
var data = [];
var docfields = [];
data.push([__("Bulk Edit {0}", [title])]);
@@ -732,9 +827,9 @@ export default class Grid {
data.push([__("The CSV format is case sensitive")]);
data.push([__("Do not edit headers which are preset in the template")]);
data.push(["------"]);
- $.each(frappe.get_meta(me.df.options).fields, function(i, df) {
+ $.each(frappe.get_meta(this.df.options).fields, (i, df) => {
// don't include the read-only field in the template
- if(frappe.model.is_value_type(df.fieldtype)) {
+ if (frappe.model.is_value_type(df.fieldtype)) {
data[1].push(df.label);
data[2].push(df.fieldname);
let description = (df.description || "") + ' ';
@@ -747,13 +842,13 @@ export default class Grid {
});
// add data
- $.each(me.frm.doc[me.df.fieldname] || [], function(i, d) {
+ $.each(this.frm.doc[this.df.fieldname] || [], (i, d) => {
var row = [];
- $.each(data[2], function(i, fieldname) {
+ $.each(data[2], (i, fieldname) => {
var value = d[fieldname];
// format date
- if(docfields[i].fieldtype==="Date" && value) {
+ if (docfields[i].fieldtype==="Date" && value) {
value = frappe.datetime.str_to_user(value);
}
@@ -766,10 +861,11 @@ export default class Grid {
return false;
});
}
+
add_custom_button(label, click) {
// add / unhide a custom button
var btn = this.custom_buttons[label];
- if(!btn) {
+ if (!btn) {
btn = $('')
.css('margin-right', '4px')
.prependTo(this.grid_buttons)
@@ -779,6 +875,7 @@ export default class Grid {
btn.removeClass('hidden');
}
}
+
clear_custom_buttons() {
// hide all custom buttons
this.grid_buttons.find('.btn-custom').addClass('hidden');
diff --git a/frappe/public/js/frappe/form/grid_pagination.js b/frappe/public/js/frappe/form/grid_pagination.js
new file mode 100644
index 0000000000..190a58c5fe
--- /dev/null
+++ b/frappe/public/js/frappe/form/grid_pagination.js
@@ -0,0 +1,132 @@
+export default class GridPagination {
+
+ constructor(opts) {
+ $.extend(this, opts);
+ this.setup_pagination();
+ }
+
+ setup_pagination() {
+ this.page_length = 50;
+ this.page_index = 1;
+ this.total_pages = Math.ceil(this.grid.data.length/this.page_length);
+
+ this.render_pagination();
+ }
+
+ render_pagination() {
+ if (this.grid.data.length <= this.page_length) {
+ this.wrapper.find('.grid-pagination').html('');
+ } else {
+ let $pagination_template = this.get_pagination_html();
+ this.wrapper.find('.grid-pagination').html($pagination_template);
+ this.prev_page_button = this.wrapper.find('.prev-page');
+ this.next_page_button = this.wrapper.find('.next-page');
+ this.$page_number = this.wrapper.find('.current-page-number');
+ this.$total_pages = this.wrapper.find('.total-page-number');
+ this.first_page_button = this.wrapper.find('.first-page');
+ this.last_page_button = this.wrapper.find('.last-page');
+
+ this.bind_pagination_events();
+ }
+ }
+
+ bind_pagination_events() {
+ this.prev_page_button.on('click', () => {
+ this.render_prev_page();
+ });
+
+ this.next_page_button.on('click', () => {
+ this.render_next_page();
+ });
+
+ this.first_page_button.on('click', () => {
+ this.go_to_page(1);
+ });
+
+ this.last_page_button.on('click', () => {
+ this.go_to_page(this.total_pages);
+ });
+ }
+
+
+ update_page_numbers() {
+ let total_pages = Math.ceil(this.grid.data.length/this.page_length);
+ if (this.total_pages !== total_pages) {
+ this.total_pages = total_pages;
+ this.render_pagination();
+ }
+ }
+
+ check_page_number() {
+ if (this.page_index > this.total_pages && this.page_index > 1) {
+ this.go_to_page(this.page_index-1);
+ }
+ }
+
+ get_pagination_html() {
+ let page_text_html = `
-
-
+
@@ -90,20 +104,20 @@ export default class Grid {
this.wrapper = $(template)
.appendTo(this.parent)
- .attr("data-fieldname", this.df.fieldname);
+ .attr('data-fieldname', this.df.fieldname);
+
+ frappe.utils.bind_actions_with_object(this.wrapper, this);
this.form_grid = this.wrapper.find('.form-grid');
- this.wrapper.find(".grid-add-row").click(function() {
- me.add_new_row(null, null, true);
- me.set_focus_on_row();
+ this.setup_add_row();
- return false;
- });
+ this.setup_grid_pagination();
this.custom_buttons = {};
this.grid_buttons = this.wrapper.find('.grid-buttons');
- this.remove_rows_button = this.grid_buttons.find('.grid-remove-rows')
+ this.remove_rows_button = this.grid_buttons.find('.grid-remove-rows');
+ this.remove_all_rows_button = this.grid_buttons.find('.grid-remove-all-rows');
this.setup_allow_bulk_edit();
this.setup_check();
@@ -112,79 +126,121 @@ export default class Grid {
}
}
- setup_check() {
- var me = this;
+ setup_grid_pagination() {
+ this.grid_pagination = new GridPagination({
+ grid: this,
+ wrapper: this.wrapper,
+ });
+ }
- this.wrapper.on('click', '.grid-row-check', function(e) {
- var $check = $(this);
- if($check.parents('.grid-heading-row:first').length!==0) {
+ setup_check() {
+
+ this.wrapper.on('click', '.grid-row-check', (e) => {
+ var $check = $(e.currentTarget);
+ if ($check.parents('.grid-heading-row:first').length !== 0) {
// select all?
var checked = $check.prop('checked');
$check.parents('.form-grid:first')
.find('.grid-row-check').prop('checked', checked);
// set all
- (me.grid_rows || []).forEach(function(row) { row.doc.__checked = checked ? 1 : 0; });
+ let result_length = this.grid_pagination.get_result_length();
+ let page_index = this.grid_pagination.page_index;
+ let page_length = this.grid_pagination.page_length;
+ for (var ri = (page_index-1)*page_length; ri < result_length; ri++) {
+ this.grid_rows[ri].doc.__checked = checked ? 1: 0;
+ }
} else {
var docname = $check.parents('.grid-row:first').attr('data-name');
- me.grid_rows_by_docname[docname].select($check.prop('checked'));
+ this.grid_rows_by_docname[docname].select($check.prop('checked'));
}
- me.refresh_remove_rows_button();
+ this.refresh_remove_rows_button();
});
- this.remove_rows_button.on('click', function() {
- var dirty = false;
-
- let tasks = [];
- me.get_selected_children().forEach((doc) => {
- tasks.push(() => {
- if (!me.frm) {
- me.df.data = me.get_data();
- me.df.data = me.df.data.filter((row)=> row.idx != doc.idx);
- }
- me.grid_rows_by_docname[doc.name].remove();
- dirty = true;
- });
- tasks.push(() => frappe.timeout(0.1));
- });
-
- if (!me.frm) {
- tasks.push(() => {
- // reorder idx of df.data
- me.df.data.forEach((row, index) => row.idx = index + 1);
- });
- }
-
- tasks.push(() => {
- if (dirty) me.refresh();
- });
-
- frappe.run_serially(tasks);
- });
}
+
+ delete_rows() {
+ var dirty = false;
+
+ let tasks = [];
+ let selected_children = this.get_selected_children();
+ selected_children.forEach(doc => {
+ tasks.push(() => {
+ if (!this.frm) {
+ this.df.data = this.get_data();
+ this.df.data = this.df.data.filter(row => row.idx != doc.idx);
+ }
+ this.grid_rows_by_docname[doc.name].remove();
+ dirty = true;
+ });
+ tasks.push(() => frappe.timeout(0.1));
+ });
+
+ if (!this.frm) {
+ tasks.push(() => {
+ // reorder idx of df.data
+ this.df.data.forEach((row, index) => row.idx = index + 1);
+ });
+ }
+
+ tasks.push(() => {
+ if (dirty) this.refresh();
+ });
+
+ frappe.run_serially(tasks);
+
+ if (selected_children.length == this.grid_pagination.page_length) {
+ frappe.utils.scroll_to(this.wrapper);
+ }
+ }
+
+ delete_all_rows() {
+ frappe.confirm(__("Are you sure you want to delete all rows?"), () => {
+ this.frm.doc[this.df.fieldname] = [];
+ $(this.parent).find('.rows').empty();
+ this.grid_rows = [];
+ this.refresh();
+ frappe.utils.scroll_to(this.wrapper);
+ });
+
+ }
+
select_row(name) {
this.grid_rows_by_docname[name].select();
}
+
remove_all() {
this.grid_rows.forEach(row => {
row.remove();
});
}
+
refresh_remove_rows_button() {
this.remove_rows_button.toggleClass('hidden',
this.wrapper.find('.grid-body .grid-row-check:checked:first').length ? false : true);
+ this.remove_all_rows_button.toggleClass('hidden',
+ this.wrapper.find('.grid-body .grid-row-check:checked:first').length ? false : true);
}
+
get_selected() {
- return (this.grid_rows || []).map(function(row) { return row.doc.__checked ? row.doc.name : null; })
- .filter(function(d) { return d; });
+ return (this.grid_rows || []).map(row => {
+ return row.doc.__checked ? row.doc.name : null;
+ }).filter(d => {
+ return d;
+ });
}
+
get_selected_children() {
- return (this.grid_rows || []).map(function(row) { return row.doc.__checked ? row.doc : null; })
- .filter(function(d) { return d; });
+ return (this.grid_rows || []).map(row => {
+ return row.doc.__checked ? row.doc : null;
+ }).filter(d => {
+ return d;
+ });
}
+
make_head() {
// labels
- if(!this.header_row) {
+ if (!this.header_row) {
this.header_row = new GridRow({
parent: $(this.parent).find(".grid-heading-row"),
parent_df: this.df,
@@ -194,15 +250,16 @@ export default class Grid {
});
}
}
+
refresh(force) {
+ this.data = this.get_data();
+
!this.wrapper && this.make();
- var me = this,
- $rows = $(me.parent).find(".rows"),
- data = this.get_data();
+ let $rows = $(this.parent).find('.rows');
this.setup_fields();
- if(this.frm) {
+ if (this.frm) {
this.display_status = frappe.perm.get_field_display_status(this.df, this.frm.doc,
this.perm);
} else {
@@ -213,24 +270,58 @@ export default class Grid {
if(this.display_status === "None") return;
// redraw
- var _scroll_y = $(document).scrollTop();
this.make_head();
- if(!this.grid_rows) {
+ if (!this.grid_rows) {
this.grid_rows = [];
}
- this.truncate_rows(data);
+ this.truncate_rows();
this.grid_rows_by_docname = {};
- for(var ri=0; ri < data.length; ri++) {
- var d = data[ri];
+ this.grid_pagination.update_page_numbers();
+ this.render_result_rows($rows, false);
+ this.grid_pagination.check_page_number();
+ this.wrapper.find('.grid-empty').toggleClass('hidden', Boolean(this.data.length));
- if(d.idx===undefined) {
+ // toolbar
+ this.setup_toolbar();
+ this.toggle_checkboxes(this.display_status !== 'Read');
+
+ // sortable
+ if (this.frm && this.is_sortable() && !this.sortable_setup_done) {
+ this.make_sortable($rows);
+ this.sortable_setup_done = true;
+ }
+
+ this.last_display_status = this.display_status;
+ this.last_docname = this.frm && this.frm.docname;
+
+ // red if mandatory
+ this.form_grid.toggleClass('error', !!(this.df.reqd && !(this.data && this.data.length)));
+
+ this.refresh_remove_rows_button();
+
+ this.wrapper.trigger('change');
+ }
+
+
+ render_result_rows($rows, append_row) {
+ let result_length = this.grid_pagination.get_result_length();
+ let page_index = this.grid_pagination.page_index;
+ let page_length = this.grid_pagination.page_length;
+ if (!this.grid_rows) {
+ return;
+ }
+ for (var ri = (page_index-1)*page_length; ri < result_length; ri++) {
+ var d = this.data[ri];
+ if (!d) {
+ return;
+ }
+ if (d.idx===undefined) {
d.idx = ri + 1;
}
-
- if(this.grid_rows[ri]) {
+ if (this.grid_rows[ri] && !append_row) {
var grid_row = this.grid_rows[ri];
grid_row.doc = d;
grid_row.refresh();
@@ -243,71 +334,49 @@ export default class Grid {
frm: this.frm,
grid: this
});
- this.grid_rows.push(grid_row);
+ this.grid_rows[ri] = grid_row;
}
this.grid_rows_by_docname[d.name] = grid_row;
}
-
- this.wrapper.find(".grid-empty").toggleClass("hidden", Boolean(data.length));
-
- // toolbar
- this.setup_toolbar();
- this.toggle_checkboxes(this.display_status !== 'Read');
-
- // sortable
- if(this.frm && this.is_sortable() && !this.sortable_setup_done) {
- this.make_sortable($rows);
- this.sortable_setup_done = true;
- }
-
- this.last_display_status = this.display_status;
- this.last_docname = this.frm && this.frm.docname;
-
- // frappe.utils.scroll_to(_scroll_y);
-
- // red if mandatory
- this.form_grid.toggleClass('error', !!(this.df.reqd && !(data && data.length)));
-
- this.refresh_remove_rows_button();
-
- this.wrapper.trigger('change');
}
+
setup_toolbar() {
- if(this.is_editable()) {
- this.wrapper.find(".grid-footer").toggle(true);
+
+ if (this.is_editable()) {
+ this.wrapper.find('.grid-footer').toggle(true);
// show, hide buttons to add rows
- if(this.cannot_add_rows || (this.df && this.df.cannot_add_rows)) {
+ if (this.cannot_add_rows || (this.df && this.df.cannot_add_rows)) {
// add 'hidden' to buttons
- this.wrapper.find(".grid-add-row, .grid-add-multiple-rows")
+ this.wrapper.find('.grid-add-row, .grid-add-multiple-rows')
.addClass('hidden');
} else {
// show buttons
- this.wrapper.find(".grid-add-row").removeClass('hidden');
+ this.wrapper.find('.grid-add-row').removeClass('hidden');
- if(this.multiple_set) {
- this.wrapper.find(".grid-add-multiple-rows").removeClass('hidden');
+ if (this.multiple_set) {
+ this.wrapper.find('.grid-add-multiple-rows').removeClass('hidden');
}
}
-
- } else {
- this.wrapper.find(".grid-footer").toggle(false);
+ } else if (this.grid_rows.length < this.grid_pagination.page_length ) {
+ this.wrapper.find('.grid-footer').toggle(false);
}
}
- truncate_rows(data) {
- if(this.grid_rows.length > data.length) {
+
+ truncate_rows() {
+ if (this.grid_rows.length > this.data.length) {
// remove extra rows
- for(var i=data.length; i < this.grid_rows.length; i++) {
+ for (var i = this.data.length; i < this.grid_rows.length; i++) {
var grid_row = this.grid_rows[i];
- grid_row.wrapper.remove();
+ if (grid_row) grid_row.wrapper.remove();
}
- this.grid_rows.splice(data.length);
+ this.grid_rows.splice(this.data.length);
}
}
+
setup_fields() {
- var me = this;
// reset docfield
if (this.frm && this.frm.docname) {
// use doc specific docfield object
@@ -320,21 +389,23 @@ export default class Grid {
}
}
- if(this.doctype && this.frm) {
+ if (this.doctype && this.frm) {
this.docfields = frappe.meta.get_docfields(this.doctype, this.frm.docname);
} else {
// fields given in docfield
this.docfields = this.df.fields;
}
- this.docfields.forEach(function(df) {
- me.fields_map[df.fieldname] = df;
+ this.docfields.forEach(df => {
+ this.fields_map[df.fieldname] = df;
});
}
+
refresh_row(docname) {
this.grid_rows_by_docname[docname] &&
this.grid_rows_by_docname[docname].refresh();
}
+
make_sortable($rows) {
new Sortable($rows.get(0), {
group: {name: this.df.fieldname},
@@ -349,14 +420,14 @@ export default class Grid {
}
// prevent drag behaviour if _sortable property is "false"
let idx = $(event.dragged).closest('.grid-row').attr('data-idx');
- let doc = this.get_data()[idx - 1];
+ let doc = this.data[idx%this.grid_pagination.page_length];
if (doc && doc._sortable === false) {
return false;
}
},
onUpdate: (event) => {
let idx = $(event.item).closest('.grid-row').attr('data-idx');
- let doc = this.get_data()[idx - 1];
+ let doc = this.data[idx%this.grid_pagination.page_length];
this.renumber_based_on_dom();
this.frm.script_manager.trigger(this.df.fieldname + "_move", this.df.options, doc.name);
this.refresh();
@@ -366,13 +437,15 @@ export default class Grid {
$(this.frm.wrapper).trigger("grid-make-sortable", [this.frm]);
}
+
get_data() {
var data = this.frm ?
this.frm.doc[this.df.fieldname] || []
: this.df.data || this.get_modal_data();
- data.sort(function(a, b) { return a.idx - b.idx});
+ // data.sort(function(a, b) { return a.idx - b.idx});
return data;
}
+
get_modal_data() {
return this.df.get_data() ? this.df.get_data().filter(data => {
if (!this.deleted_docs || !in_list(this.deleted_docs, data.name)) {
@@ -380,12 +453,12 @@ export default class Grid {
}
}) : [];
}
+
set_column_disp(fieldname, show) {
if($.isArray(fieldname)) {
- var me = this;
for(var i=0, l=fieldname.length; i
+
+
+ ${__(this.page_index)}
+ ${__('of')}
+ ${__(this.total_pages)}
+
`;
+
+ return $(`
+ ‹
+ ${page_text_html}
+ ›
+ `);
+ }
+
+ render_next_page() {
+ if (this.page_index*this.page_length < this.grid.data.length) {
+ this.page_index++;
+ this.go_to_page();
+ }
+ }
+
+ render_prev_page() {
+ if (this.page_index > 1) {
+ this.page_index--;
+ this.go_to_page();
+ }
+ }
+
+ go_to_page(index) {
+ if (!index) {
+ index = this.page_index;
+ } else {
+ this.page_index = index;
+ }
+ let $rows = $(this.grid.parent).find(".rows").empty();
+ this.grid.render_result_rows($rows, true);
+ if (this.$page_number) {
+ this.$page_number.text(index);
+ }
+
+ this.update_page_numbers();
+ }
+
+ go_to_last_page_to_add_row() {
+ let total_pages = this.total_pages;
+ let page_length = this.page_length;
+ if (this.grid.data.length == page_length*total_pages) {
+ this.go_to_page(total_pages + 1);
+ } else {
+ this.go_to_page(total_pages);
+ }
+ frappe.utils.scroll_to(this.wrapper);
+ }
+
+ get_result_length() {
+ return this.grid.data.length < this.page_index*this.page_length
+ ? this.grid.data.length
+ : this.page_index*this.page_length;
+ }
+
+}
\ No newline at end of file
diff --git a/frappe/public/js/frappe/form/print.js b/frappe/public/js/frappe/form/print.js
index eb9c0240f5..eb1b1464a7 100644
--- a/frappe/public/js/frappe/form/print.js
+++ b/frappe/public/js/frappe/form/print.js
@@ -43,6 +43,13 @@ frappe.ui.form.PrintPreview = Class.extend({
me.multilingual_preview();
});
+ this.wrapper
+ .find(".print-preview-refresh")
+ .on("click", function () {
+ me.set_default_print_language();
+ me.multilingual_preview();
+ });
+
//On selection of language get code and pass it to preview method
this.language_sel = this.wrapper
.find(".languages")
diff --git a/frappe/public/js/frappe/form/sidebar/review.js b/frappe/public/js/frappe/form/sidebar/review.js
index f4b8069a6e..e187ca4693 100644
--- a/frappe/public/js/frappe/form/sidebar/review.js
+++ b/frappe/public/js/frappe/form/sidebar/review.js
@@ -81,6 +81,7 @@ frappe.ui.form.Review = class Review {
label: __('To User'),
reqd: 1,
options: user_options,
+ ignore_validation: 1,
description: __('Only users involved in the document are listed')
}, {
fieldname: 'review_type',
diff --git a/frappe/public/js/frappe/form/templates/print_layout.html b/frappe/public/js/frappe/form/templates/print_layout.html
index 9bdba0d99d..568bcd830b 100644
--- a/frappe/public/js/frappe/form/templates/print_layout.html
+++ b/frappe/public/js/frappe/form/templates/print_layout.html
@@ -1,7 +1,13 @@
+
diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index 0ea9a801fb..2c5e1df1df 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -625,13 +625,17 @@ class FilterArea {
options = options.join("\n");
}
}
-
+ let default_value = (fieldtype === 'Link') ? frappe.defaults.get_user_default(options) : null;
+ if (['__default', '__global'].includes(default_value)) {
+ default_value = null;
+ }
return {
fieldtype: fieldtype,
label: __(df.label),
options: options,
fieldname: df.fieldname,
condition: condition,
+ default: default_value,
onchange: () => this.refresh_list_view(),
ignore_link_validation: fieldtype === 'Dynamic Link'
};
@@ -646,13 +650,6 @@ class FilterArea {
for (let key in fields_dict) {
let field = fields_dict[key];
let value = field.get_value();
- let default_value = (field.df.fieldtype === 'Link') ?
- frappe.defaults.get_user_default(field.df.options) : null;
-
- if (['__default', '__global'].includes(default_value)) {
- default_value = null;
- }
-
if (value) {
if (field.df.condition === 'like' && !value.includes('%')) {
value = '%' + value + '%';
@@ -663,13 +660,6 @@ class FilterArea {
field.df.condition || '=',
value
]);
- } else if (default_value) {
- filters.push([
- this.list_view.doctype,
- field.df.fieldname,
- field.df.condition,
- default_value
- ]);
}
}
diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js
index 0000a3dc73..4767e02f43 100644
--- a/frappe/public/js/frappe/list/list_sidebar.js
+++ b/frappe/public/js/frappe/list/list_sidebar.js
@@ -285,7 +285,8 @@ frappe.views.ListSidebar = class ListSidebar {
args: {
stats: me.stats,
doctype: me.doctype,
- filters: me.default_filters || []
+ // wait for list filter area to be generated before getting filters, or fallback to default filters
+ filters: (me.list_view.filter_area ? me.list_filter.get_current_filters() : me.default_filters) || []
},
callback: function(r) {
me.render_stat("_user_tags", (r.message.stats || {})["_user_tags"]);
@@ -385,7 +386,8 @@ frappe.views.ListSidebar = class ListSidebar {
}
reload_stats() {
- this.sidebar.find(".sidebar-stat").remove();
+ this.sidebar.find(".stat-link").remove();
+ this.sidebar.find(".stat-no-records").remove();
this.get_stats();
}
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index b980ae7684..777030c923 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -301,15 +301,32 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
this.columns = this.columns.slice(0, column_count);
}
+ get_documentation_link() {
+ if (this.meta.documentation) {
+ return `Need Help?`;
+ }
+ return '';
+ }
+
get_no_result_message() {
+ let help_link = this.get_documentation_link();
+ let filters = this.filter_area.get();
+ let no_result_message = filters.length ? __('No {0} found', [__(this.doctype)]) : __('You haven\'t created a {0} yet', [__(this.doctype)]);
+ let new_button_label = filters.length ? __('Create a new {0}', [__(this.doctype)]) : __('Create your first {0}', [__(this.doctype)]);
+ let empty_state_image = this.settings.empty_state_image || '/assets/frappe/images/ui-states/empty.png';
+
const new_button = this.can_create ?
`` : '';
return `
-
`;
}
@@ -390,6 +407,16 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
});
}
+ after_render() {
+ this.$no_result.html(`
+ ${__('No {0} found', [__(this.doctype)])}
+
+ 
+
+ ${no_result_message}
${new_button} + ${help_link}
+ ${this.get_no_result_message()}
+
+ `);
+ this.setup_new_doc_event();
+ this.list_sidebar.reload_stats();
+ }
+
render() {
this.render_list();
this.on_row_checked();
@@ -577,7 +604,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
data-filter="${fieldname},=,${value}">
${_value}
`;
- } else if (['Text Editor', 'Text', 'Small Text'].includes(df.fieldtype)) {
+ } else if (['Text Editor', 'Text', 'Small Text', 'HTML Editor'].includes(df.fieldtype)) {
html = `
${_value}
`;
@@ -589,7 +616,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
}
return `
+ title="${__(label)}: ${escape(_value)}">
${html}
`;
};
diff --git a/frappe/public/js/frappe/social/pages/UserList.vue b/frappe/public/js/frappe/social/pages/UserList.vue
index aff174ea10..69203a8e81 100644
--- a/frappe/public/js/frappe/social/pages/UserList.vue
+++ b/frappe/public/js/frappe/social/pages/UserList.vue
@@ -47,13 +47,6 @@
@click="toggle_log(user.name)"
>{{ user[key] }}
+
+
`).appendTo(this.$body);
+ this.setup_help_links();
+ }
+ }
+
+ setup_form() {
+ super.setup_form();
+ const fields = this.get_atomic_fields();
+ if (fields.length == 1) {
+ this.$form_wrapper.addClass("text-center");
+ } else {
+ this.$form_wrapper.removeClass("text-center");
+ }
+ }
+
+ before_show() {
+ (this.id === 0) ?
+ this.$next_btn.text(__('Let\'s Start')) : this.$next_btn.text(__('Next'));
+ //last slide
+ if (this.is_last_slide()) {
+ this.$complete_btn.removeClass('hide').addClass('action primary');
+ this.$next_btn.removeClass('action primary');
+ this.$action_button = this.$complete_btn;
+ }
+ this.setup_action_button();
+ }
+
+ primary_action() {
+ if (this.set_values()) {
+ this.$action_button.addClass('disabled');
+ const primary_method = 'frappe.desk.doctype.onboarding_slide.onboarding_slide.create_onboarding_docs';
+ if (this.add_more) {
+ this.values.max_count = this.max_count;
+ }
+ frappe.call(primary_method, {
+ values: this.values,
+ doctype: this.ref_doctype,
+ app: this.app,
+ slide_type: this.slide_type
+ }).then(() => {
+ if (this.is_last_slide()) {
+ this.reset_is_first_startup();
+ $('.onboarding-dialog').modal('toggle');
+ frappe.msgprint({
+ message: __('You are all set up!'),
+ indicator: 'green',
+ title: __('Success')
+ });
+ }
+ });
+ }
+ }
+
+ unbind_primary_action() {
+ // unbind only action method as next button is same as create button in this setup wizard
+ this.$action_button.off('click.primary_action');
+ }
+
+ setup_help_links() {
+ this.help_links.map(link => {
+ let $link = $(
+ `${link.label || __("Need Help?")}`
+ );
+ if (link.video_id) {
+ $link.on('click', () => {
+ frappe.help.show_video(link.video_id, link.label);
+ });
+ }
+ this.$help_links.append($link);
+ });
+ }
+
+ setup_action_button() {
+ if (this.slide_type === 'Create' || this.slide_type == 'Settings' || this.is_last_slide()) {
+ this.$action_button.addClass('primary');
+ } else {
+ this.$action_button.removeClass('primary');
+ }
+
+ this.$action_button.on('click', () => {
+ if (this.slide_type != 'Continue') {
+ this.mark_as_completed();
+ }
+ });
+ }
+
+ mark_as_completed() {
+ frappe.call({
+ method: 'frappe.desk.doctype.onboarding_slide.onboarding_slide.mark_slide_as_completed',
+ args: {slide_title: this.title},
+ callback: () => {},
+ freeze: true
+ });
+ }
+
+ reset_is_first_startup() {
+ frappe.call({
+ method: "frappe.desk.page.setup_wizard.setup_wizard.reset_is_first_startup",
+ args: {},
+ callback: () => {}
+ });
+ }
+};
+
+frappe.setup.OnboardingDialog = class OnboardingDialog {
+ constructor({
+ slides = []
+ }) {
+ this.slides = slides;
+ this.setup();
+ }
+
+ setup() {
+ this.dialog = new frappe.ui.Dialog({
+ static: true,
+ minimizable: false,
+ });
+ this.$wrapper = $(this.dialog.$wrapper).addClass('onboarding-dialog');
+ this.slide_container = new frappe.ui.Slides({
+ parent: this.dialog.body,
+ slides: this.slides,
+ slide_class: frappe.setup.OnboardingSlide,
+ unidirectional: 1,
+ before_load: ($footer) => {
+ $footer.find('.prev-btn').addClass('hide');
+ $footer.find('.next-btn').removeClass('btn-default').addClass('btn-primary action');
+ $footer.find('.text-right').prepend(
+ $(``));
+ }
+ });
+
+ this.$wrapper.find('.modal-header').remove();
+ }
+
+ show() {
+ this.dialog.show();
+ }
+};
diff --git a/frappe/public/js/frappe/ui/slides.js b/frappe/public/js/frappe/ui/slides.js
index 7db8e958ce..19a6cf9263 100644
--- a/frappe/public/js/frappe/ui/slides.js
+++ b/frappe/public/js/frappe/ui/slides.js
@@ -26,7 +26,9 @@ frappe.ui.Slide = class Slide {
-
+
+ 
+
+ `);
} else if (result.image === null) {
$result.append(''
diff --git a/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js b/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js
deleted file mode 100644
index 4da50f61f2..0000000000
--- a/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-frappe.provide("frappe.setup");
-frappe.provide("frappe.ui");
-
-frappe.setup.UserProgressSlide = class UserProgressSlide extends frappe.ui.Slide {
- constructor(slide = null) {
- super(slide);
- }
-
- make() {
- super.make();
- }
-
- setup_done_state() {
- this.$body.find(".slide-help").hide();
- this.$body.find(".form-wrapper").hide();
- this.slides_footer.find('.next-btn').addClass('btn-primary');
- this.slides_footer.find('.done-btn').hide();
- this.$primary_btn.hide();
- this.make_done_state();
- }
-
- make_done_state() {
- this.$done_state = $(``).appendTo(this.$body);
-
- this.$done_state_title = this.$done_state.find('.title');
- this.$check = this.$done_state.find('.check');
- this.$help_links = this.$done_state.find('.help-links');
-
- if(this.done_state_title) {
- $("" + this.done_state_title + "").appendTo(this.$done_state_title);
- this.$done_state_title.on('click', () => {
- frappe.set_route(this.done_state_title_route);
- });
- }
-
- if(this.help_links) {
- this.help_links.map(link => {
- let $link = $(`${link.label}`);
- if(link.url) {
- $link.attr({"href": link.url});
- } else if(link.video_id) {
- $link.on('click', () => {
- frappe.help.show_video(link.video_id, link.label);
- })
- }
- this.$help_links.append($link);
- });
- }
-
- }
-
- before_show() {
- if(this.done) {
- this.slides_footer.find('.next-btn').addClass('btn-primary');
- this.slides_footer.find('.done-btn').hide();
- } else {
- this.slides_footer.find('.next-btn').removeClass('btn-primary');
- this.slides_footer.find('.done-btn').show();
- }
- if(this.dialog_dismissed) {
- this.slides_footer.find('.next-btn').removeClass('btn-primary');
- }
- }
-
- primary_action() {
- var me = this;
- if(this.set_values()) {
- this.slides_footer.find('.make-btn').addClass('disabled');
- frappe.call({
- method: me.submit_method,
- args: {args_data: me.values},
- callback: function() {
- me.done = 1;
- me.refresh();
- },
- onerror: function() {
- me.slides_footer.find('.make-btn').removeClass('disabled');
- },
- freeze: true
- });
- }
- }
-};
-
-frappe.setup.UserProgressDialog = class UserProgressDialog {
- constructor({
- slides = []
- }) {
- this.slides = slides;
- this.progress_state_dict = {};
- this.slides.map(slide => {
- this.progress_state_dict[slide.action_name] = slide.done || 0;
- });
- this.progress_percent = 0;
- this.setup();
- }
-
- setup() {
- this.dialog = new frappe.ui.Dialog({title: __("Complete Setup")});
- this.$wrapper = $(this.dialog.$wrapper).addClass('user-progress-dialog');
- this.slide_container = new frappe.ui.Slides({
- parent: this.dialog.body,
- slides: this.slides,
- slide_class: frappe.setup.UserProgressSlide,
- done_state: 1,
- before_load: ($footer) => {
- $footer.find('.text-right')
- .prepend($(`
- ${__("Mark as Done")}`))
- .append($(`
- ${__('Create')}`));
- },
- on_update: (completed, total) => {
- let percent = completed * 100 / total;
- $('.user-progress .progress-bar').css({'width': percent + '%'});
- if(percent === 100) {
- this.dismiss_progress();
- }
- }
- });
-
- this.$wrapper.find('.done-btn').on('click', () => {
- this.mark_as_done();
- });
-
- this.get_and_update_progress_state();
- this.check_for_updates();
- }
-
- mark_as_done() {
- let me = this;
- let current_slide = this.slide_container.current_slide;
- frappe.call({
- method: current_slide.mark_as_done_method,
- args: {action_name: current_slide.action_name},
- callback: function() {
- current_slide.done = 1;
- current_slide.refresh();
- },
- freeze: true
- });
- }
-
- check_for_updates() {
- this.updater = setInterval(() => {
- this.get_and_update_progress_state();
- }, 60000);
- }
-
- get_and_update_progress_state() {
- var me = this;
- frappe.call({
- method: "frappe.desk.user_progress.update_and_get_user_progress",
- callback: function(r) {
- let states = r.message;
- let changed = 0;
- let completed = 0;
- Object.keys(states).map(action_name => {
- if(states[action_name]) {
- completed ++;
- }
- if(me.progress_state_dict[action_name] != states[action_name]) {
- changed = 1;
- me.progress_state_dict[action_name] = states[action_name];
- }
- });
-
- if(changed) {
- Object.keys(me.slide_container.slide_dict).map((id) => {
- let slide = me.slide_container.slide_dict[id];
- if(me.progress_state_dict[slide.action_name]) {
- if(!slide.done) {
- slide.done = 1;
- slide.refresh();
- }
- }
- });
-
- }
- me.progress_percent = completed / Object.keys(states).length * 100;
- me.update_progress();
- },
- freeze: false
- });
- }
-
- update_progress() {
- $('.user-progress .progress-bar').css({'width': this.progress_percent + '%'});
- if(this.progress_percent === 100) {
- this.dismiss_progress();
- }
- }
-
- dismiss_progress() {
- $('.user-progress').addClass('hide');
- clearInterval(this.updater);
- }
-
- show() {
- this.dialog.show();
- }
-};
diff --git a/frappe/public/js/frappe/utils/datetime.js b/frappe/public/js/frappe/utils/datetime.js
index 8481fec5c5..12badc5353 100644
--- a/frappe/public/js/frappe/utils/datetime.js
+++ b/frappe/public/js/frappe/utils/datetime.js
@@ -90,6 +90,14 @@ $.extend(frappe.datetime, {
return moment().endOf("month").format();
},
+ quarter_start: function() {
+ return moment().startOf("quarter").format();
+ },
+
+ quarter_end: function() {
+ return moment().endOf("quarter").format();
+ },
+
year_start: function(){
return moment().startOf("year").format();
},
diff --git a/frappe/public/js/frappe/utils/number_format.js b/frappe/public/js/frappe/utils/number_format.js
index b8a18610bd..57022b22c5 100644
--- a/frappe/public/js/frappe/utils/number_format.js
+++ b/frappe/public/js/frappe/utils/number_format.js
@@ -144,10 +144,7 @@ function get_currency_symbol(currency) {
}
function get_number_format(currency) {
- let format = null;
- if (currency) format = frappe.model.get_value(":Currency", currency, "number_format");
-
- return format || (frappe.boot && frappe.boot.sysdefaults && frappe.boot.sysdefaults.number_format) || "#,###.##";
+ return (frappe.boot && frappe.boot.sysdefaults && frappe.boot.sysdefaults.number_format) || "#,###.##";
}
function get_number_format_info(format) {
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 00b6f95f06..d4caa45a89 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -264,11 +264,11 @@ Object.assign(frappe.utils, {
if(has_words(["Pending", "Review", "Medium", "Not Approved"], text)) {
style = "warning";
colour = "orange";
- } else if(has_words(["Open", "Urgent", "High"], text)) {
+ } else if(has_words(["Open", "Urgent", "High", "Failed"], text)) {
style = "danger";
colour = "red";
- } else if(has_words(["Closed", "Finished", "Converted", "Completed", "Confirmed",
- "Approved", "Yes", "Active", "Available", "Paid"], text)) {
+ } else if(has_words(["Closed", "Finished", "Converted", "Completed", "Complete", "Confirmed",
+ "Approved", "Yes", "Active", "Available", "Paid", "Success"], text)) {
style = "success";
colour = "green";
} else if(has_words(["Submitted"], text)) {
diff --git a/frappe/public/js/frappe/views/calendar/calendar.js b/frappe/public/js/frappe/views/calendar/calendar.js
index b84d37cff4..71ac175ba0 100644
--- a/frappe/public/js/frappe/views/calendar/calendar.js
+++ b/frappe/public/js/frappe/views/calendar/calendar.js
@@ -308,6 +308,7 @@ frappe.views.Calendar = Class.extend({
doctype: this.doctype,
start: this.get_system_datetime(start),
end: this.get_system_datetime(end),
+ fields: this.fields,
filters: this.list_view.filter_area.get(),
field_map: this.field_map
};
@@ -356,9 +357,13 @@ frappe.views.Calendar = Class.extend({
prepare_colors: function(d) {
let color, color_name;
if(this.get_css_class) {
- color_name = this.color_map[this.get_css_class(d)];
- color_name = frappe.ui.color.validate_hex(color_name) ?
- color_name : 'blue';
+ color_name = this.color_map[this.get_css_class(d)] || 'blue';
+
+ if (color_name.startsWith("#")) {
+ color_name = frappe.ui.color.validate_hex(color_name) ?
+ color_name : 'blue';
+ }
+
d.backgroundColor = frappe.ui.color.get(color_name, 'extra-light');
d.textColor = frappe.ui.color.get(color_name, 'dark');
} else {
diff --git a/frappe/public/js/frappe/views/components/DeskModuleBox.vue b/frappe/public/js/frappe/views/components/DeskModuleBox.vue
index 355a447475..0d809508ee 100644
--- a/frappe/public/js/frappe/views/components/DeskModuleBox.vue
+++ b/frappe/public/js/frappe/views/components/DeskModuleBox.vue
@@ -63,7 +63,7 @@ export default {
}
},
dropdown_links() {
- return this.links.length > 0 ? this.links
+ return this.type === 'module' ? this.links
.filter(link => !link.hidden)
.concat([
{ label: __('Customize'), action: () => this.$emit('customize'), class: 'border-top' }
diff --git a/frappe/public/js/frappe/views/components/DeskSection.vue b/frappe/public/js/frappe/views/components/DeskSection.vue
index 9b24f75294..83670a3e82 100644
--- a/frappe/public/js/frappe/views/components/DeskSection.vue
+++ b/frappe/public/js/frappe/views/components/DeskSection.vue
@@ -26,7 +26,8 @@ export default {
},
data() {
return {
- dragging: false
+ dragging: false,
+ fetched_module_links: {}
}
},
mounted() {
@@ -53,6 +54,7 @@ export default {
})
},
show_module_card_customize_dialog(module) {
+ const me = this;
const d = new frappe.ui.Dialog({
title: __('Customize Shortcuts'),
fields: [
@@ -60,11 +62,19 @@ export default {
label: __('Shortcuts'),
fieldname: 'links',
fieldtype: 'MultiSelectPills',
- get_data() {
- return frappe.call('frappe.desk.moduleview.get_links_for_module', {
- app: module.app,
- module: module.module_name,
- }).then(r => r.message);
+ get_data: () => {
+ const module_links = me.fetched_module_links[module.module_name];
+ if (!module_links) {
+ return frappe.xcall('frappe.desk.moduleview.get_links_for_module', {
+ app: module.app,
+ module: module.module_name,
+ }).then(links => {
+ me.fetched_module_links[module.module_name] = links;
+ return links;
+ });
+ } else {
+ return module_links;
+ }
},
default: module.links.filter(l => !l.hidden).map(l => l.name)
}
@@ -73,7 +83,7 @@ export default {
primary_action: ({ links }) => {
frappe.call('frappe.desk.moduleview.update_links_for_module', {
module_name: module.module_name,
- links
+ links: links || []
}).then(r => {
this.$emit('update-desktop-settings', r.message);
});
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 560cb3d17b..c7e976306d 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -293,6 +293,12 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
this.last_ajax.abort();
}
+ const query_params = this.get_query_params();
+
+ if (query_params.prepared_report_name) {
+ filters.prepared_report_name = query_params.prepared_report_name;
+ }
+
return new Promise(resolve => {
this.last_ajax = frappe.call({
method: 'frappe.desk.query_report.run',
@@ -303,7 +309,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
},
callback: resolve,
always: () => this.page.btn_secondary.prop('disabled', false)
- })
+ });
}).then(r => {
let data = r.message;
this.hide_status();
@@ -313,18 +319,18 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
if (data.prepared_report) {
this.prepared_report = true;
- const query_string = frappe.utils.get_query_string(frappe.get_route_str());
- const query_params = frappe.utils.get_query_params(query_string);
// If query_string contains prepared_report_name then set filters
// to match the mentioned prepared report doc and disable editing
- if(query_params.prepared_report_name) {
+ if (query_params.prepared_report_name) {
this.prepared_report_action = "Edit";
const filters_from_report = JSON.parse(data.doc.filters);
Object.values(this.filters).forEach(function(field) {
if (filters_from_report[field.fieldname]) {
field.set_input(filters_from_report[field.fieldname]);
}
- field.input.disabled = true;
+ if (field.input) {
+ field.input.disabled = true;
+ }
});
}
this.add_prepared_report_buttons(data.doc);
@@ -357,6 +363,12 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
});
}
+ get_query_params() {
+ const query_string = frappe.utils.get_query_string(frappe.get_route_str());
+ const query_params = frappe.utils.get_query_params(query_string);
+ return query_params;
+ }
+
add_prepared_report_buttons(doc) {
if(doc){
this.page.add_inner_button(__("Download Report"), function (){
@@ -440,6 +452,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
render_datatable() {
let data = this.data;
+ let columns = this.columns.filter((col) => !col.hidden);
if (this.raw_data.add_total_row) {
data = data.slice();
@@ -448,10 +461,10 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
if (this.datatable) {
this.datatable.options.treeView = this.tree_report;
- this.datatable.refresh(data, this.columns);
+ this.datatable.refresh(data, columns);
} else {
let datatable_options = {
- columns: this.columns.filter((col) => !col.hidden),
+ columns: columns,
data: data,
inlineFilters: true,
treeView: this.tree_report,
@@ -495,6 +508,9 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
})
};
}
+ options.axisOptions = {
+ shortenYAxisNumbers: 1
+ };
return options;
}
@@ -549,7 +565,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
get_possible_chart_options() {
const columns = this.columns;
const rows = this.raw_data.result.filter(value => Object.keys(value).length);
- const first_row = Array.isArray(rows[0]) ? rows[0] : Object.values(rows[0]);
+ const first_row = Array.isArray(rows[0]) ? rows[0] : columns.map(col => rows[0][col.fieldname]);
const me = this
const indices = first_row.reduce((accumulator, current_value, current_index) => {
diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js
index a4cefd1d02..f1d1d5076e 100644
--- a/frappe/public/js/frappe/web_form/web_form.js
+++ b/frappe/public/js/frappe/web_form/web_form.js
@@ -101,7 +101,9 @@ export default class WebForm extends frappe.ui.FieldGroup {
this.validate && this.validate();
// validation hack: get_values will check for missing data
- super.get_values(this.allow_incomplete);
+ let isvalid = super.get_values(this.allow_incomplete);
+
+ if (!isvalid) return;
if (window.saving) return;
let for_payment = Boolean(this.accept_payment && !this.doc.paid);
diff --git a/frappe/public/less/common.less b/frappe/public/less/common.less
index 0f49c43de1..d6dc56cf6c 100644
--- a/frappe/public/less/common.less
+++ b/frappe/public/less/common.less
@@ -28,6 +28,10 @@ p {
margin: 10px 0;
}
+details > summary {
+ cursor: pointer;
+}
+
.text-color {
color: @text-color !important;
}
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 5a515b6e84..0a8062efa2 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -897,6 +897,7 @@ input[type="checkbox"] {
&:focus {
outline: none;
}
+
.fa-circle {
font-size: 10px;
margin: 0px 2px;
@@ -928,6 +929,7 @@ input[type="checkbox"] {
}
.lead {
margin-top: 20px;
+ font-weight: 500;
}
.success-state {
margin-bottom: 20px;
@@ -959,28 +961,39 @@ input[type="checkbox"] {
}
}
-// User Progress Dialog
-.user-progress-dialog {
- .slides-progress {
- margin-top: 15px;
+// Onboarding Dialog
+.onboarding-dialog {
+
+ .slide-body {
+ width: 65%;
+ margin-right: auto;
+ margin-left: auto;
}
- .done-state {
- .check-container {
- font-size: 64px;
- margin: 40px;
- }
+ .modal-dialog {
+ width: 50%;
+ height: 80%;
+ max-width: none;
+ }
- .title {
- font-weight: normal;
- }
+ .onboarding-icon {
+ color: @text-muted;
+ margin-right: 5px;
+ }
- .help-links {
+ .modal-content .slide-container {
+ height: auto;
+ min-height: 100%;
+ bottom: 0;
+ }
- a {
- margin: 0px 10px;
- }
- }
+ img {
+ max-height: 175px;
+ width: auto;
+ }
+
+ .slides-progress {
+ margin-top: 15px;
}
}
diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less
index 9c40131067..9a0eec46ea 100644
--- a/frappe/public/less/form.less
+++ b/frappe/public/less/form.less
@@ -239,6 +239,18 @@
.progress-area {
padding-top: 15px;
padding-bottom: 15px;
+
+ .progress-chart {
+ padding-top: 15px;
+ }
+
+ .progress {
+ margin-bottom: 5px;
+ }
+
+ .progress-message {
+ margin-top: 0px;
+ }
}
.form-links {
diff --git a/frappe/public/less/form_grid.less b/frappe/public/less/form_grid.less
index 7b498c1e26..f41b60d4cb 100644
--- a/frappe/public/less/form_grid.less
+++ b/frappe/public/less/form_grid.less
@@ -268,6 +268,32 @@
border-top: 0px;
}
+.grid-pagination {
+ padding: 0;
+}
+
+.page-text {
+ display: inline-block;
+}
+
+.prev-page, .next-page {
+ font-size: 14px;
+}
+
+a.prev-page {
+ padding-left: 15px;
+ text-decoration: none;
+}
+
+a.next-page {
+ padding-right: 15px;
+ text-decoration: none;
+}
+
+.page-number {
+ padding: 0 3px;
+}
+
.grid-footer-toolbar {
padding: 10px 15px;
border-top: 1px solid @border-color;
diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less
index efcbad4653..ea292daca2 100644
--- a/frappe/public/less/list.less
+++ b/frappe/public/less/list.less
@@ -4,6 +4,23 @@
.result, .no-result, .freeze {
min-height: ~"calc(100vh - 284px)";
}
+
+ .msg-box {
+ margin-bottom: 8em;
+ // To compensate for percieved centering
+
+ .null-state {
+ height: 15rem !important;
+ max-height: 150px;
+ width: auto;
+ }
+
+ .meta-description {
+ width: 45%;
+ margin-right: auto;
+ margin-left: auto;
+ }
+ }
}
.freeze-row {
@@ -600,4 +617,4 @@ input.list-check-all, input.list-row-checkbox {
.file-title {
margin-top: 5px;
-}
\ No newline at end of file
+}
diff --git a/frappe/public/less/notifications.less b/frappe/public/less/notifications.less
index 7a49709d16..52e1c07f1e 100644
--- a/frappe/public/less/notifications.less
+++ b/frappe/public/less/notifications.less
@@ -33,7 +33,7 @@
}
.category-list[data-category="Open Documents"] li a:hover {
- background-color: #f0f4f7;
+ background-color: #f0f4f7;
}
.open-doc-count {
@@ -70,7 +70,7 @@
}
a.recent-item:hover {
- background-color: #f0f4f7;
+ background-color: #f0f4f7;
}
a.unread:hover .mark-read {
@@ -102,17 +102,19 @@ a.unread:hover .mark-read {
background: @light-yellow;
}
-.notification-timestamp {
- margin-top: 5px;
- font-size: 11px;
- display: inline-block;
- margin-bottom: 10px;
-}
+.recent-item {
+ .notification-timestamp {
+ margin-top: 5px;
+ font-size: 11px;
+ display: inline-block;
+ margin-bottom: 10px;
+ }
-.user-avatar {
- float: left;
- margin-right: 10px;
- margin-bottom: 30px;
+ .user-avatar {
+ float: left;
+ margin-right: 10px;
+ margin-bottom: 30px;
+ }
}
.event-time {
diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index 246cd721ac..61d47712f3 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -400,7 +400,9 @@ body[data-route^="Module"] .main-menu {
max-height: 300px;
overflow-y: auto;
max-width: 250px;
+ z-index: 100;
}
+
.dropdown-search {
padding: 8px;
}
@@ -448,7 +450,7 @@ body[data-route^="Module"] .main-menu {
flex-basis: 50%;
text-align: center;
align-self: center;
- font-size: @text-small;
+ font-size: 9px;
}
cursor: pointer;
}
diff --git a/frappe/sessions.py b/frappe/sessions.py
index ffad4b5e7b..cca40cbc55 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -155,7 +155,7 @@ def get():
bootinfo["disable_async"] = frappe.conf.disable_async
bootinfo["setup_complete"] = cint(frappe.db.get_single_value('System Settings', 'setup_complete'))
-
+ bootinfo["is_first_startup"] = cint(frappe.db.get_single_value('System Settings', 'is_first_startup'))
return bootinfo
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index 5986e90bfb..6615c2ab1d 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -83,7 +83,8 @@ class EnergyPointRule(Document):
def process_energy_points(doc, state):
if (frappe.flags.in_patch
or frappe.flags.in_install
- or frappe.flags.in_migrate):
+ or frappe.flags.in_migrate
+ or frappe.flags.in_import):
return
if not is_energy_point_enabled():
diff --git a/frappe/templates/print_formats/standard.html b/frappe/templates/print_formats/standard.html
index 5e707cddcb..77b8f09bb7 100644
--- a/frappe/templates/print_formats/standard.html
+++ b/frappe/templates/print_formats/standard.html
@@ -21,7 +21,7 @@
{% endif %}
{% for section in page %}
-
+
{%- if doc.print_line_breaks and loop.index != 1 -%}
{%- endif -%} {%- if doc.print_section_headings and section.label and section.has_data -%}
{errors}""".format( - limit=limit, url=get_url(), errors="
".join(errors)) - else: - return 0, "
{%- endif -%} {%- if doc.print_section_headings and section.label and section.has_data -%}
{{ _(section.label) }}
diff --git a/frappe/test_runner.py b/frappe/test_runner.py index e7ec13afe6..b66a96595d 100644 --- a/frappe/test_runner.py +++ b/frappe/test_runner.py @@ -36,6 +36,9 @@ def main(app=None, module=None, doctype=None, verbose=False, tests=(), with open(frappe.get_app_path(app, doctype_list_path), 'r') as f: doctype = f.read().strip().splitlines() + if ui_tests: + print("Selenium testing has been deprecated\nUse bench --site {site_name} run-ui-tests for Cypress tests") + xmloutput_fh = None if junit_xml_output: xmloutput_fh = open(junit_xml_output, 'wb') @@ -71,7 +74,7 @@ def main(app=None, module=None, doctype=None, verbose=False, tests=(), else: ret = run_all_tests(app, verbose, profile, ui_tests, failfast=failfast, junit_xml_output=junit_xml_output) - frappe.db.commit() + if frappe.db: frappe.db.commit() # workaround! since there is no separate test db frappe.clear_cache() @@ -175,21 +178,6 @@ def run_tests_for_module(module, verbose=False, tests=(), profile=False, junit_x return _run_unittest(module, verbose=verbose, tests=tests, profile=profile, junit_xml_output=junit_xml_output) -def run_setup_wizard_ui_test(app=None, verbose=False, profile=False): - '''Run setup wizard UI test using test_test_runner''' - frappe.flags.run_setup_wizard_ui_test = 1 - return run_ui_tests(app=app, test=None, verbose=verbose, profile=profile) - -def run_ui_tests(app=None, test=None, test_list=None, verbose=False, profile=False): - '''Run a single unit test for UI using test_test_runner''' - module = importlib.import_module('frappe.tests.ui.test_test_runner') - frappe.flags.ui_test_app = app - if test_list: - frappe.flags.ui_test_list = test_list - else: - frappe.flags.ui_test_path = test - return _run_unittest(module, verbose=verbose, tests=(), profile=profile) - def _run_unittest(modules, verbose=False, tests=(), profile=False, junit_xml_output=False): test_suite = unittest.TestSuite() diff --git a/frappe/tests/__init__.py b/frappe/tests/__init__.py index dda38c93f9..e69de29bb2 100644 --- a/frappe/tests/__init__.py +++ b/frappe/tests/__init__.py @@ -1,46 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt - -from __future__ import unicode_literals - -import frappe -from werkzeug.wrappers import Request -from werkzeug.test import EnvironBuilder - -def set_request(**kwargs): - builder = EnvironBuilder(**kwargs) - frappe.local.request = Request(builder.get_environ()) - -def insert_test_data(doctype, sort_fn=None): - import frappe.model - data = get_test_doclist(doctype) - if sort_fn: - data = sorted(data, key=sort_fn) - - for doclist in data: - frappe.insert(doclist) - -def get_test_doclist(doctype, name=None): - """get test doclist, collection of doclists""" - import os - from frappe import conf - from frappe.modules.utils import peval_doclist - from frappe.modules import scrub - - doctype = scrub(doctype) - doctype_path = os.path.join(os.path.dirname(os.path.abspath(conf.__file__)), - conf.test_data_path, doctype) - - if name: - with open(os.path.join(doctype_path, scrub(name) + ".json"), 'r') as txtfile: - doclist = peval_doclist(txtfile.read()) - - return doclist - - else: - all_doclists = [] - for fname in filter(lambda n: n.endswith(".json"), os.listdir(doctype_path)): - with open(os.path.join(doctype_path, scrub(fname)), 'r') as txtfile: - all_doclists.append(peval_doclist(txtfile.read())) - - return all_doclists diff --git a/frappe/tests/test_api.py b/frappe/tests/test_api.py index 232b2be4a8..19ea9a0124 100644 --- a/frappe/tests/test_api.py +++ b/frappe/tests/test_api.py @@ -5,13 +5,14 @@ from __future__ import unicode_literals import unittest, frappe, os from frappe.core.doctype.user.user import generate_keys from frappe.frappeclient import FrappeClient +from frappe.utils.data import get_url import requests import base64 class TestAPI(unittest.TestCase): def test_insert_many(self): - server = FrappeClient(frappe.get_site_config().host_name, "Administrator", "admin", verify=False) + server = FrappeClient(get_url(), "Administrator", "admin", verify=False) frappe.db.sql("delete from `tabNote` where title in ('Sing','a','song','of','sixpence')") frappe.db.commit() @@ -30,7 +31,7 @@ class TestAPI(unittest.TestCase): self.assertTrue(frappe.db.get_value('Note', {'title': 'sixpence'})) def test_create_doc(self): - server = FrappeClient(frappe.get_site_config().host_name, "Administrator", "admin", verify=False) + server = FrappeClient(get_url(), "Administrator", "admin", verify=False) frappe.db.sql("delete from `tabNote` where title = 'test_create'") frappe.db.commit() @@ -39,13 +40,13 @@ class TestAPI(unittest.TestCase): self.assertTrue(frappe.db.get_value('Note', {'title': 'test_create'})) def test_list_docs(self): - server = FrappeClient(frappe.get_site_config().host_name, "Administrator", "admin", verify=False) + server = FrappeClient(get_url(), "Administrator", "admin", verify=False) doc_list = server.get_list("Note") self.assertTrue(len(doc_list)) def test_get_doc(self): - server = FrappeClient(frappe.get_site_config().host_name, "Administrator", "admin", verify=False) + server = FrappeClient(get_url(), "Administrator", "admin", verify=False) frappe.db.sql("delete from `tabNote` where title = 'get_this'") frappe.db.commit() @@ -56,7 +57,7 @@ class TestAPI(unittest.TestCase): self.assertTrue(doc) def test_update_doc(self): - server = FrappeClient(frappe.get_site_config().host_name, "Administrator", "admin", verify=False) + server = FrappeClient(get_url(), "Administrator", "admin", verify=False) frappe.db.sql("delete from `tabNote` where title in ('Sing','sing')") frappe.db.commit() @@ -68,7 +69,7 @@ class TestAPI(unittest.TestCase): self.assertTrue(doc["title"] == changed_title) def test_delete_doc(self): - server = FrappeClient(frappe.get_site_config().host_name, "Administrator", "admin", verify=False) + server = FrappeClient(get_url(), "Administrator", "admin", verify=False) frappe.db.sql("delete from `tabNote` where title = 'delete'") frappe.db.commit() @@ -90,21 +91,21 @@ class TestAPI(unittest.TestCase): api_key = frappe.db.get_value("User", "Administrator", "api_key") header = {"Authorization": "token {}:{}".format(api_key, generated_secret)} - res = requests.post(frappe.get_site_config().host_name + "/api/method/frappe.auth.get_logged_user", headers=header) + res = requests.post(get_url() + "/api/method/frappe.auth.get_logged_user", headers=header) self.assertEqual(res.status_code, 200) self.assertEqual("Administrator", res.json()["message"]) self.assertEqual(keys['api_secret'], generated_secret) header = {"Authorization": "Basic {}".format(base64.b64encode(frappe.safe_encode("{}:{}".format(api_key, generated_secret))).decode())} - res = requests.post(frappe.get_site_config().host_name + "/api/method/frappe.auth.get_logged_user", headers=header) + res = requests.post(get_url() + "/api/method/frappe.auth.get_logged_user", headers=header) self.assertEqual(res.status_code, 200) self.assertEqual("Administrator", res.json()["message"]) # Valid api key, invalid api secret api_secret = "ksk&93nxoe3os" header = {"Authorization": "token {}:{}".format(api_key, api_secret)} - res = requests.post(frappe.get_site_config().host_name + "/api/method/frappe.auth.get_logged_user", headers=header) + res = requests.post(get_url() + "/api/method/frappe.auth.get_logged_user", headers=header) self.assertEqual(res.status_code, 403) @@ -112,5 +113,5 @@ class TestAPI(unittest.TestCase): api_key = "@3djdk3kld" api_secret = "ksk&93nxoe3os" header = {"Authorization": "token {}:{}".format(api_key, api_secret)} - res = requests.post(frappe.get_site_config().host_name + "/api/method/frappe.auth.get_logged_user", headers=header) + res = requests.post(get_url() + "/api/method/frappe.auth.get_logged_user", headers=header) self.assertEqual(res.status_code, 401) diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py new file mode 100644 index 0000000000..5257e1c717 --- /dev/null +++ b/frappe/tests/test_formatter.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +import frappe +from frappe import format +import unittest + +class TestFormatter(unittest.TestCase): + def test_currency_formatting(self): + df = frappe._dict({ + 'fieldname': 'amount', + 'fieldtype': 'Currency', + 'options': 'currency' + }) + + doc = frappe._dict({ + 'amount': 5 + }) + frappe.db.set_default("currency", 'INR') + + # if currency field is not passed then default currency should be used. + self.assertEqual(format(100, df, doc), '₹ 100.00') + + doc.currency = 'USD' + self.assertEqual(format(100, df, doc), "$ 100.00") + + frappe.db.set_default("currency", None) \ No newline at end of file diff --git a/frappe/tests/test_frappeoauth2client.py b/frappe/tests/test_frappeoauth2client.py deleted file mode 100644 index ebf09adf6d..0000000000 --- a/frappe/tests/test_frappeoauth2client.py +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt -from __future__ import unicode_literals - -import unittest, frappe, requests, time -from frappe.test_runner import make_test_records -from frappe.utils.selenium_testdriver import TestDriver -from six.moves.urllib.parse import urlparse -from frappe.frappeclient import FrappeOAuth2Client - -class TestFrappeOAuth2Client(unittest.TestCase): - def setUp(self): - self.driver = TestDriver() - make_test_records("OAuth Client") - make_test_records("User") - self.client_id = frappe.get_all("OAuth Client", fields=["*"])[0].get("client_id") - - # Set Frappe server URL reqired for id_token generation - try: - frappe_login_key = frappe.get_doc("Social Login Key", "frappe") - except frappe.DoesNotExistError: - frappe_login_key = frappe.new_doc("Social Login Key") - frappe_login_key.get_social_login_provider("Frappe", initialize=True) - frappe_login_key.base_url = "http://localhost:8000" - frappe_login_key.save() - - def test_insert_note(self): - - # Go to Authorize url - self.driver.get( - "api/method/frappe.integrations.oauth2.authorize?client_id=" + - self.client_id + - "&scope=all%20openid&response_type=code&redirect_uri=http%3A%2F%2Flocalhost" - ) - - time.sleep(2) - - # Login - username = self.driver.find("#login_email")[0] - username.send_keys("test@example.com") - - password = self.driver.find("#login_password")[0] - password.send_keys("Eastern_43A1W") - - sign_in = self.driver.find(".btn-login")[0] - sign_in.submit() - - time.sleep(2) - - # Allow access to resource - allow = self.driver.find("#allow")[0] - allow.click() - - time.sleep(2) - - # Get authorization code from redirected URL - auth_code = urlparse(self.driver.driver.current_url).query.split("=")[1] - - payload = "grant_type=authorization_code&code=" - payload += auth_code - payload += "&redirect_uri=http%3A%2F%2Flocalhost&client_id=" - payload += self.client_id - - headers = {'content-type':'application/x-www-form-urlencoded'} - - # Request for bearer token - token_response = requests.post( frappe.get_site_config().host_name + - "/api/method/frappe.integrations.oauth2.get_token", data=payload, headers=headers) - - # Parse bearer token json - bearer_token = token_response.json() - client = FrappeOAuth2Client(frappe.get_site_config().host_name, bearer_token.get("access_token")) - - notes = [ - {"doctype": "Note", "title": "Sing", "public": True}, - {"doctype": "Note", "title": "a", "public": True}, - {"doctype": "Note", "title": "Song", "public": True}, - {"doctype": "Note", "title": "of", "public": True}, - {"doctype": "Note", "title": "sixpence", "public": True} - ] - - for note in notes: - client.insert(note) - - self.assertTrue(len(frappe.get_all("Note")) == 5) diff --git a/frappe/tests/test_global_search.py b/frappe/tests/test_global_search.py index 3fcf1fe9ed..01067c85dd 100644 --- a/frappe/tests/test_global_search.py +++ b/frappe/tests/test_global_search.py @@ -80,7 +80,7 @@ class TestGlobalSearch(unittest.TestCase): make_property_setter(doctype, "repeat_on", "in_global_search", 1, "Int") global_search.rebuild_for_doctype(doctype) results = global_search.search('Monthly') - self.assertEqual(len(results), 2) + self.assertEqual(len(results), 3) def test_delete_doc(self): self.insert_test_events() diff --git a/frappe/tests/test_listview.py b/frappe/tests/test_listview.py index 5c0657e9ee..3a73301608 100644 --- a/frappe/tests/test_listview.py +++ b/frappe/tests/test_listview.py @@ -6,7 +6,7 @@ import unittest import frappe import json -from frappe.desk.listview import get_list_settings, set_list_settings +from frappe.desk.listview import get_list_settings, set_list_settings, get_group_by_count class TestListView(unittest.TestCase): def setUp(self): @@ -51,3 +51,13 @@ class TestListView(unittest.TestCase): self.assertEqual(settings.disable_count, 0) self.assertEqual(settings.disable_sidebar_stats, 0) + def test_list_view_child_table_filter_with_created_by_filter(self): + if frappe.db.exists("Note", "Test created by filter with child table filter"): + frappe.delete_doc("Note", "Test created by filter with child table filter") + + doc = frappe.get_doc({"doctype": "Note", "title": "Test created by filter with child table filter", "public": 1}) + doc.append("seen_by", {"user": "Administrator"}) + doc.insert() + + data = {d.name: d.count for d in get_group_by_count('Note', '[["Note Seen By","user","=","Administrator"]]', 'owner')} + self.assertEqual(data['Administrator'], 1) \ No newline at end of file diff --git a/frappe/tests/test_recorder.py b/frappe/tests/test_recorder.py index bffddc4ea1..d45ef12e86 100644 --- a/frappe/tests/test_recorder.py +++ b/frappe/tests/test_recorder.py @@ -7,7 +7,7 @@ from __future__ import unicode_literals import unittest import frappe import frappe.recorder -from .test_website import set_request +from frappe.utils import set_request import sqlparse diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py index 1f8c7943c4..e554fd23be 100644 --- a/frappe/tests/test_scheduler.py +++ b/frappe/tests/test_scheduler.py @@ -2,75 +2,81 @@ from __future__ import unicode_literals from unittest import TestCase from dateutil.relativedelta import relativedelta -from frappe.utils.scheduler import (enqueue_applicable_events, restrict_scheduler_events_if_dormant, - get_enabled_scheduler_events) -from frappe import _dict -from frappe.utils.background_jobs import enqueue -from frappe.utils import now_datetime, today, add_days, add_to_date +from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs +from frappe.utils.background_jobs import enqueue, get_jobs +from frappe.utils.scheduler import enqueue_events, is_dormant, schedule_jobs_based_on_activity +from frappe.utils import add_days, get_datetime import frappe import time def test_timeout(): - '''This function needs to be pickleable''' time.sleep(100) +def test_timeout_10(): + time.sleep(10) + +def test_method(): + pass + class TestScheduler(TestCase): def setUp(self): - frappe.db.set_global('enabled_scheduler_events', "") - frappe.flags.ran_schedulers = [] + if not frappe.get_all('Scheduled Job Type', limit=1): + sync_jobs() - def test_all_events(self): - last = now_datetime() - relativedelta(hours=2) - enqueue_applicable_events(frappe.local.site, now_datetime(), last) - self.assertTrue("all" in frappe.flags.ran_schedulers) + def test_enqueue_jobs(self): + frappe.db.sql("update `tabScheduled Job Type` set last_execution = '2010-01-01 00:00:00'") - def test_enabled_events(self): - frappe.flags.enabled_events = ["hourly", "hourly_long", "daily", "daily_long", - "weekly", "weekly_long", "monthly", "monthly_long"] + frappe.flags.execute_job = True + enqueue_events(site = frappe.local.site) + frappe.flags.execute_job = False - # maintain last_event and next_event on the same day - last_event = now_datetime().replace(hour=0, minute=0, second=0, microsecond=0) - next_event = last_event + relativedelta(minutes=30) + self.assertTrue('frappe.email.queue.clear_outbox', frappe.flags.enqueued_jobs) + self.assertTrue('frappe.utils.change_log.check_for_update', frappe.flags.enqueued_jobs) + self.assertTrue('frappe.email.doctype.auto_email_report.auto_email_report.send_monthly', frappe.flags.enqueued_jobs) - enqueue_applicable_events(frappe.local.site, next_event, last_event) - self.assertFalse("cron" in frappe.flags.ran_schedulers) + def test_queue_peeking(self): + job = get_test_job() - # maintain last_event and next_event on the same day - last_event = now_datetime().replace(hour=0, minute=0, second=0, microsecond=0) - next_event = last_event + relativedelta(hours=2) + self.assertTrue(job.enqueue()) + job.db_set('last_execution', '2010-01-01 00:00:00') + frappe.db.commit() - frappe.flags.ran_schedulers = [] - enqueue_applicable_events(frappe.local.site, next_event, last_event) - self.assertTrue("all" in frappe.flags.ran_schedulers) - self.assertTrue("hourly" in frappe.flags.ran_schedulers) + # 1 job in queue + self.assertTrue(job.enqueue()) + job.db_set('last_execution', '2010-01-01 00:00:00') + frappe.db.commit() - frappe.flags.enabled_events = None + # 2nd job not loaded + self.assertFalse(job.enqueue()) + job.delete() - def test_enabled_events_day_change(self): + def test_is_dormant(self): + self.assertTrue(is_dormant(check_time= get_datetime('2100-01-01 00:00:00'))) + self.assertTrue(is_dormant(check_time = add_days(frappe.db.get_last_created('Activity Log'), 5))) + self.assertFalse(is_dormant(check_time = frappe.db.get_last_created('Activity Log'))) - # use flags instead of globals as this test fails intermittently - # the root cause has not been identified but the culprit seems cache - # since cache is mutable, it maybe be changed by a parallel process - frappe.flags.enabled_events = ["daily", "daily_long", "weekly", "weekly_long", - "monthly", "monthly_long"] - - # maintain last_event and next_event on different days - next_event = now_datetime().replace(hour=0, minute=0, second=0, microsecond=0) - last_event = next_event - relativedelta(hours=2) - - frappe.flags.ran_schedulers = [] - enqueue_applicable_events(frappe.local.site, next_event, last_event) - self.assertTrue("all" in frappe.flags.ran_schedulers) - self.assertFalse("hourly" in frappe.flags.ran_schedulers) - - frappe.flags.enabled_events = None + def test_once_a_day_for_dormant(self): + frappe.db.clear_table('Scheduled Job Log') + self.assertTrue(schedule_jobs_based_on_activity(check_time= get_datetime('2100-01-01 00:00:00'))) + self.assertTrue(schedule_jobs_based_on_activity(check_time = add_days(frappe.db.get_last_created('Activity Log'), 5))) + # create a fake job executed 5 days from now + job = get_test_job(method='frappe.tests.test_scheduler.test_method', frequency='Daily') + job.execute() + job_log = frappe.get_doc('Scheduled Job Log', dict(scheduled_job_type=job.name)) + job_log.db_set('creation', add_days(frappe.db.get_last_created('Activity Log'), 5)) + # inactive site with recent job, don't run + self.assertFalse(schedule_jobs_based_on_activity(check_time = add_days(frappe.db.get_last_created('Activity Log'), 5))) + # one more day has passed + self.assertTrue(schedule_jobs_based_on_activity(check_time = add_days(frappe.db.get_last_created('Activity Log'), 6))) + frappe.db.rollback() def test_job_timeout(self): + return job = enqueue(test_timeout, timeout=10) count = 5 while count > 0: @@ -81,5 +87,19 @@ class TestScheduler(TestCase): self.assertTrue(job.is_failed) - def tearDown(self): - frappe.flags.ran_schedulers = [] +def get_test_job(method='frappe.tests.test_scheduler.test_timeout_10', frequency='All'): + if not frappe.db.exists('Scheduled Job Type', dict(method=method)): + job = frappe.get_doc(dict( + doctype = 'Scheduled Job Type', + method = method, + last_execution = '2010-01-01 00:00:00', + frequency = frequency + )).insert() + else: + job = frappe.get_doc('Scheduled Job Type', dict(method=method)) + job.db_set('last_execution', '2010-01-01 00:00:00') + job.db_set('frequency', frequency) + frappe.db.commit() + + return job + diff --git a/frappe/tests/test_sitemap.py b/frappe/tests/test_sitemap.py index 6f98e3ed48..455a80eb3e 100644 --- a/frappe/tests/test_sitemap.py +++ b/frappe/tests/test_sitemap.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals import frappe, unittest -from frappe.tests.test_website import get_html_for_route +from frappe.utils import get_html_for_route class TestSitemap(unittest.TestCase): def test_sitemap(self): diff --git a/frappe/tests/test_twofactor.py b/frappe/tests/test_twofactor.py index 27129d9832..d18a25b43e 100644 --- a/frappe/tests/test_twofactor.py +++ b/frappe/tests/test_twofactor.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import unittest, frappe, pyotp from frappe.auth import HTTPRequest from frappe.utils import cint -from frappe.tests import set_request +from frappe.utils import set_request from frappe.auth import validate_ip_address from frappe.twofactor import (should_run_2fa, authenticate_for_2factor, get_cached_user_pass, two_factor_is_enabled_for_, confirm_otp_token, get_otpsecret_for_, get_verification_obj) @@ -157,8 +157,8 @@ def create_http_request(): '''Get http request object.''' set_request(method='POST', path='login') enable_2fa() - frappe.form_dict['usr'] = 'test@erpnext.com' - frappe.form_dict['pwd'] = 'test' + frappe.form_dict['usr'] = 'test@example.com' + frappe.form_dict['pwd'] = 'Eastern_43A1W' frappe.local.form_dict['cmd'] = 'login' http_requests = HTTPRequest() return http_requests diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index 9efd4d04a1..d114f7d1b2 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -1,23 +1,13 @@ from __future__ import unicode_literals -import frappe, unittest -from werkzeug.wrappers import Request -from werkzeug.test import EnvironBuilder +import unittest +import frappe from frappe.website import render +from frappe.utils import set_request -def set_request(**kwargs): - builder = EnvironBuilder(**kwargs) - frappe.local.request = Request(builder.get_environ()) - -def get_html_for_route(route): - set_request(method='GET', path=route) - response = render.render() - html = frappe.safe_decode(response.get_data()) - return html class TestWebsite(unittest.TestCase): - def test_page_load(self): frappe.set_user('Guest') set_request(method='POST', path='login') @@ -76,4 +66,3 @@ class TestWebsite(unittest.TestCase): delattr(frappe.hooks, 'website_redirects') frappe.cache().delete_key('app_hooks') - diff --git a/frappe/tests/ui/data/test_lib.js b/frappe/tests/ui/data/test_lib.js deleted file mode 100644 index 0fbbc2b748..0000000000 --- a/frappe/tests/ui/data/test_lib.js +++ /dev/null @@ -1,249 +0,0 @@ -frappe.tests = { - data: {}, - make: function(doctype, data) { - let dialog_is_active = () => { - return ( - cur_dialog && (!cur_frm || cur_frm.doc.doctype != doctype) - ); - }; - return frappe.run_serially([ - () => frappe.set_route('List', doctype), - () => frappe.new_doc(doctype), - () => { - if (frappe.quick_entry) { - frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(); - return frappe.timeout(1); - } else { - let root_node; - if (cur_tree) { - for (const key in cur_tree.nodes) { - if (cur_tree.nodes[key].parent_label && cur_tree.nodes[key].expandable) { - root_node = cur_tree.nodes[key].label; - break; - } - } - } - if (root_node){ - frappe.tests.open_add_child_dialog(root_node); - return frappe.timeout(1); - } - } - }, - () => { - if(dialog_is_active()) { - return frappe.tests.set_dialog_values(cur_dialog, data); - } else { - return frappe.tests.set_form_values(cur_frm, data); - } - }, - - () => { - if(dialog_is_active()) { - return cur_dialog.get_primary_btn().click(); - } else { - return frappe.quick_entry ? frappe.quick_entry.insert() : cur_frm.save(); - } - } - ]); - }, - open_add_child_dialog: (root_node) => { - frappe.tests.click_link(root_node); - frappe.timeout(1); - frappe.tests.click_button('Add Child'); - }, - set_form_values: (frm, data) => { - let tasks = []; - - data.forEach(item => { - for (let key in item) { - let task = () => { - let value = item[key]; - if ($.isArray(value)) { - return frappe.tests.set_grid_values(frm, key, value); - } else { - // single value - return frm.set_value(key, value); - } - }; - tasks.push(task); - tasks.push(frappe.after_ajax); - tasks.push(() => frappe.timeout(0.4)); - } - }); - - // set values - return frappe.run_serially(tasks); - - }, - set_dialog_values: (dialog, data) => { - let tasks = []; - - data.forEach(item => { - for (let key in item) { - let task = () => { - let value = item[key]; - return dialog.set_value(key, value); - }; - tasks.push(task); - tasks.push(frappe.after_ajax); - tasks.push(() => frappe.timeout(0.4)); - } - }); - - return frappe.run_serially(tasks); - }, - set_grid_values: (frm, key, value) => { - // set value in grid - let grid = frm.get_field(key).grid; - grid.remove_all(); - - let grid_row_tasks = []; - - // build tasks for each row - value.forEach(d => { - grid_row_tasks.push(() => { - - let grid_value_tasks = []; - grid_value_tasks.push(() => grid.add_new_row()); - grid_value_tasks.push(() => grid.get_row(-1).toggle_view(true)); - grid_value_tasks.push(() => frappe.timeout(0.5)); - - // build tasks to set each row value - d.forEach(child_value => { - for (let child_key in child_value) { - grid_value_tasks.push(() => { - let grid_row = grid.get_row(-1); - return frappe.model.set_value(grid_row.doc.doctype, - grid_row.doc.name, child_key, child_value[child_key]); - }); - grid_value_tasks.push(frappe.after_ajax); - grid_value_tasks.push(() => frappe.timeout(0.4)); - } - }); - - return frappe.run_serially(grid_value_tasks); - }); - }); - return frappe.run_serially(grid_row_tasks); - }, - setup_doctype: (doctype, data) => { - return frappe.run_serially([ - () => frappe.set_route('List', doctype), - () => frappe.timeout(1), - () => { - frappe.tests.data[doctype] = []; - let expected = Object.keys(data); - cur_list.data.forEach((d) => { - frappe.tests.data[doctype].push(d.name); - if(expected.indexOf(d.name) !== -1) { - expected[expected.indexOf(d.name)] = null; - } - }); - - let tasks = []; - - expected.forEach(function(d) { - if(d) { - tasks.push(() => frappe.tests.make(doctype, - data[d])); - } - }); - - return frappe.run_serially(tasks); - }]); - }, - click_page_head_item: (text) => { - // Method to items present on the page header like New, Save, Delete etc. - let possible_texts = ["New", "Delete", "Save", "Yes"]; - return frappe.run_serially([ - () => { - if (text == "Menu"){ - $(`span.menu-btn-group-label:contains('Menu'):visible`).click(); - } else if (text == "Refresh") { - $(`.btn-secondary:contains('Refresh'):visible`).click(); - } else if (possible_texts.includes(text)) { - $(`.btn-primary:contains("${text}"):visible`).click(); - } - }, - () => frappe.timeout(1) - ]); - }, - click_dropdown_item: (text) => { - // Method to click dropdown elements - return frappe.run_serially([ - () => { - let li = $(`.dropdown-menu li:contains("${text}"):visible`).get(0); - $(li).find(`a`).click(); - }, - () => frappe.timeout(1) - ]); - }, - click_desktop_icon: (text) => { - // Method to click the desktop icons on the Desk, by their name - return frappe.run_serially([ - () => $("#icon-grid > div > div.app-icon[title="+text+"]").click(), - () => frappe.timeout(1) - ]); - }, - is_visible: (text, tag='a') => { - // Method to check the visibility of an element - return $(`${tag}:contains("${text}")`).is(`:visible`); - }, - /** - * Clicks a button on a form. - * @param {String} text - The button's text - * @return {frappe.timeout} - * @throws will throw an exception if a matching visible button is not found - */ - click_button: function(text) { - let element = $(`.btn:contains("${text}"):visible`); - if(!element.length) { - throw `did not find any button containing ${text}`; - } - element.click(); - return frappe.timeout(0.5); - }, - /** - * Clicks a link on a form. - * @param {String} text - The text of the link to be clicked - * @return {frappe.timeout} - * @throws will throw an exception if a link with the given text is not found - */ - click_link: function(text) { - let element = $(`a:contains("${text}"):visible`); - if(!element.length) { - throw `did not find any link containing ${text}`; - } - element.get(0).click(); - return frappe.timeout(0.5); - }, - /** - * Sets the given control to the value given. - * @param {String} fieldname - The Doctype's field name - * @param {String} value - The value the control should be changed to - * @return {frappe.timeout} - * @throws will throw an exception if the field is not found or is not visible - */ - set_control: function(fieldname, value) { - let control = $(`.form-control[data-fieldname="${fieldname}"]:visible`); - if(!control.length) { - throw `did not find any control with fieldname ${fieldname}`; - } - control.val(value).trigger('change'); - return frappe.timeout(0.5); - }, - /** - * Checks if given field is disabled. - * @param {String} fieldname - The Doctype field name - * @return {Boolean} true if condition is met - * @throws will throw an exception if the field is not found or is not a form control - */ - is_disabled_field: function(fieldname){ - let control = $(`.form-control[data-fieldname="${fieldname}"]:disabled`); - if(!control.length) { - throw `did not find any control with fieldname ${fieldname}`; - } else { - return true; - } - } -}; \ No newline at end of file diff --git a/frappe/tests/ui/test_calendar_view.js b/frappe/tests/ui/test_calendar_view.js deleted file mode 100644 index 914f6174da..0000000000 --- a/frappe/tests/ui/test_calendar_view.js +++ /dev/null @@ -1,79 +0,0 @@ -QUnit.module('views'); - -QUnit.test("Calendar View Tests", function(assert) { - assert.expect(3); - let done = assert.async(); - let random_text = frappe.utils.get_random(3); - let today = frappe.datetime.get_today()+" 16:20:35"; //arbitrary value taken to prevent cases like 12a for 12:00am and 12h to 24h conversion - let visible_time = () => { - // Method to return the start-time (hours) of the event visible - return $('.fc-time').text().split('p')[0]; // 'p' because the arbitrary time is pm - }; - let event_title_text = () => { - // Method to return the title of the event visible - return $('.fc-title:visible').text(); - }; - - frappe.run_serially([ - // create 2 events, one private, one public - () => frappe.tests.make("Event", [ - {subject: random_text + ':Pri'}, - {starts_on: today}, - {event_type: 'Private'} - ]), - - () => frappe.timeout(1), - - () => frappe.tests.make("Event", [ - {subject: random_text + ':Pub'}, - {starts_on: today}, - {event_type: 'Public'} - ]), - - () => frappe.timeout(1), - - // Goto Calendar view - () => frappe.set_route(["List", "Event", "Calendar"]), - - // clear filter - () => cur_list.filter_area.remove('event_type'), - () => frappe.timeout(2), - // Check if event is created - () => { - // Check if the event exists and if its title matches with the one created - assert.ok(event_title_text().includes(random_text + ':Pri'), - "Event title verified"); - }, - - // check filter - () => cur_list.filter_area.add('Event', 'event_type', '=', 'Public'), - () => frappe.timeout(1), - () => { - // private event should be hidden - assert.notOk(event_title_text().includes(random_text + ':Pri'), - "Event title verified"); - }, - - // Delete event - // Goto Calendar view - () => frappe.set_route(["List", "Event", "Calendar"]), - () => frappe.timeout(1), - // delete event - () => frappe.click_link(random_text + ':Pub'), - () => { - frappe.tests.click_page_head_item('Menu'); - frappe.tests.click_dropdown_item('Delete'); - }, - () => frappe.timeout(0.5), - () => frappe.click_button('Yes'), - () => frappe.timeout(2), - () => frappe.set_route(["List", "Event", "Calendar"]), - () => frappe.click_button("Refresh"), - () => frappe.timeout(1), - - // Check if event is deleted - () => assert.notOk(event_title_text().includes(random_text + ':Pub'), - "Event deleted"), - () => done() - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_control_geolocation.js b/frappe/tests/ui/test_control_geolocation.js deleted file mode 100644 index 0e3bedda26..0000000000 --- a/frappe/tests/ui/test_control_geolocation.js +++ /dev/null @@ -1,39 +0,0 @@ -QUnit.module('controls'); - -QUnit.test("Test ControlGeolocation", function(assert) { - assert.expect(1); - - const random_name = frappe.utils.get_random(3).toLowerCase(); - - let done = assert.async(); - - // geolocation alert dialog suppressed (only secure origins or localhost allowed) - window.alert = function() { - console.log.apply(console, arguments); //eslint-disable-line - }; - - frappe.run_serially([ - () => { - return frappe.tests.make('Custom Field', [ - {dt: 'ToDo'}, - {fieldtype: 'Geolocation'}, - {label: random_name}, - ]); - }, - () => frappe.set_route('List', 'ToDo'), - () => frappe.new_doc('ToDo'), - () => { - if (frappe.quick_entry) - { - frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(); - return frappe.timeout(1); - } - }, - () => { - const control = $(`.frappe-control[data-fieldname="${random_name}"]`); - - return assert.ok(control.data('fieldtype') === 'Geolocation'); - }, - () => done() - ]); -}); diff --git a/frappe/tests/ui/test_control_html.js b/frappe/tests/ui/test_control_html.js deleted file mode 100644 index 0cb70cc4fd..0000000000 --- a/frappe/tests/ui/test_control_html.js +++ /dev/null @@ -1,57 +0,0 @@ -QUnit.module('controls'); - -QUnit.test("Test ControlHTML", function(assert) { - assert.expect(3); - const random_name = frappe.utils.get_random(3).toLowerCase(); - - let done = assert.async(); - - frappe.run_serially([ - () => { - return frappe.tests.make('Custom Field', [ - {dt: 'ToDo'}, - {fieldtype: 'HTML'}, - {label: random_name}, - {options: 'Test
'} - ]); - }, - () => { - return frappe.tests.make('Custom Field', [ - {dt: 'ToDo'}, - {fieldtype: 'HTML'}, - {label: random_name + "_template"}, - {options: 'Test {{ doc.status }}
'} - ]); - }, - () => frappe.set_route('List', 'ToDo'), - () => frappe.new_doc('ToDo'), - () => { - if (frappe.quick_entry) - { - frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(); - return frappe.timeout(1); - } - }, - () => { - const control = $(`.frappe-control[data-fieldname="${random_name}"]`)[0]; - - return assert.ok(control.innerHTML === 'Test
'); - }, - () => { - const control = $(`.frappe-control[data-fieldname="${random_name}_template"]`)[0]; - // refresh input must be called independently - cur_frm.get_field(`${random_name}_template`).refresh_input(); - - return assert.ok(control.innerHTML === 'Test Open
'); - }, - () => frappe.tests.set_control("status", "Closed"), - () => frappe.timeout(1), - () => { - const control = $(`.frappe-control[data-fieldname="${random_name}_template"]`)[0]; - // refresh input must be called independently - cur_frm.get_field(`${random_name}_template`).refresh_input(); - return assert.ok(control.innerHTML === 'Test Closed
'); - }, - () => done() - ]); -}); diff --git a/frappe/tests/ui/test_kanban/test_kanban_column.js b/frappe/tests/ui/test_kanban/test_kanban_column.js deleted file mode 100644 index 0c4593a8dd..0000000000 --- a/frappe/tests/ui/test_kanban/test_kanban_column.js +++ /dev/null @@ -1,31 +0,0 @@ -QUnit.module('views'); - -QUnit.test("Test: Setting column colour [Kanban view]", function(assert) { - assert.expect(3); - let done = assert.async(); - function get_column(name, colour) { - return ('.kanban-column:contains('+name+')>div>div>ul>li>div.'+colour); - } - - frappe.run_serially([ - () => frappe.set_route("List", "ToDo", "Kanban", "Kanban test"), - () => frappe.timeout(1), - () => assert.deepEqual(["List", "ToDo", "Kanban", "Kanban test"], frappe.get_route(), - "Kanban view opened successfully."), - () => { - // set colour for columns - $(get_column('High', "red")).click(); - $(get_column('Medium', "green")).click(); - $(get_column('Low', "yellow")).click(); - }, - () => frappe.timeout(1), - () => { - //check if different colours are set - assert.equal($('.red > span')[0].innerText, 'High', - "Colour is set for kanban column."); - assert.equal($('.green > span')[0].innerText, 'Medium', - "Different colour is set for other column."); - }, - () => done() - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_kanban/test_kanban_creation.js b/frappe/tests/ui/test_kanban/test_kanban_creation.js deleted file mode 100644 index 3e1afbefdf..0000000000 --- a/frappe/tests/ui/test_kanban/test_kanban_creation.js +++ /dev/null @@ -1,34 +0,0 @@ -QUnit.module('views'); - -QUnit.test("Test: Creation [Kanban view]", function(assert) { - assert.expect(2); - let done = assert.async(); - - const board_name = 'Kanban test'; - - frappe.run_serially([ - () => frappe.set_route("List", "ToDo", "List"), - // wait for cur_list to initialize - () => cur_list.init(), - // click kanban in side bar - () => frappe.tests.click_link('Kanban'), - () => frappe.tests.click_link('New Kanban Board'), - () => frappe.timeout(0.5), - // create new kanban - () => { - assert.equal(cur_dialog.title, 'New Kanban Board', - "Dialog for new kanban opened."); - cur_dialog.set_value('board_name', board_name); - cur_dialog.set_value('field_name', 'Priority'); - }, - () => frappe.timeout(0.5), - () => cur_dialog.get_primary_btn().click(), - () => frappe.timeout(1), - () => frappe.set_route("List", "Kanban Board", "List"), - () => frappe.timeout(0.5), - // check in kanban list if new kanban is created - () => assert.equal(cur_list.data[0].name, board_name, - "Added kanban is visible in kanban list."), - () => done() - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_kanban/test_kanban_filters.js b/frappe/tests/ui/test_kanban/test_kanban_filters.js deleted file mode 100644 index 5e9af9f0fa..0000000000 --- a/frappe/tests/ui/test_kanban/test_kanban_filters.js +++ /dev/null @@ -1,27 +0,0 @@ -QUnit.module('views'); - -QUnit.test("Test: Filters [Kanban view]", function(assert) { - assert.expect(3); - let done = assert.async(); - - frappe.run_serially([ - () => frappe.set_route("List", "ToDo", "Kanban", "Kanban test"), - () => frappe.timeout(1), - () => { - assert.deepEqual(["List", "ToDo", "Kanban", "Kanban test"], frappe.get_route(), - "Kanban view opened successfully."); - }, - // set filter values - () => cur_list.filter_area.add('ToDo', 'priority', '=', 'Low'), - () => frappe.timeout(1), - () => cur_list.page.btn_secondary.click(), - () => frappe.timeout(1), - () => { - assert.equal(cur_list.data[0].priority, 'Low', - 'visible element has low priority'); - let non_low_items = cur_list.data.filter(d => d.priority != 'Low'); - assert.equal(non_low_items.length, 0, 'No item without low priority'); - }, - () => done() - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_kanban/test_kanban_view.js b/frappe/tests/ui/test_kanban/test_kanban_view.js deleted file mode 100644 index 4ed9597cf0..0000000000 --- a/frappe/tests/ui/test_kanban/test_kanban_view.js +++ /dev/null @@ -1,29 +0,0 @@ -QUnit.module('views'); - -QUnit.test("Test: Kanban view", function(assert) { - assert.expect(4); - let done = assert.async(); - - frappe.run_serially([ - () => frappe.set_route("List", "ToDo", "List"), - // calculate number of element in list - () => frappe.timeout(1), - () => frappe.set_route("List", "ToDo", "Kanban", "Kanban test"), - () => frappe.timeout(2), - () => { - assert.equal('Kanban', cur_list.view_name, - "Current view is kanban."); - assert.equal("Kanban test", cur_list.page_title, - "Kanban view opened successfully."); - // check if all elements are visible in kanban view - const $high_priority_cards = - $('.kanban-column[data-column-value="High"] .kanban-card-wrapper'); - const $low_priority_cards = - $('.kanban-column[data-column-value="Low"] .kanban-card-wrapper'); - - assert.equal($high_priority_cards.length, 1); - assert.equal($low_priority_cards.length, 1); - }, - () => done() - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_linked_with.js b/frappe/tests/ui/test_linked_with.js deleted file mode 100644 index aeaced2d19..0000000000 --- a/frappe/tests/ui/test_linked_with.js +++ /dev/null @@ -1,19 +0,0 @@ -QUnit.module('form'); - -QUnit.test("Test Linked With", function(assert) { - assert.expect(2); - const done = assert.async(); - - frappe.run_serially([ - () => frappe.set_route('Form', 'Module Def', 'Contacts'), - () => frappe.tests.click_page_head_item('Menu'), - () => frappe.tests.click_dropdown_item('Links'), - () => frappe.timeout(4), - () => { - assert.equal(cur_dialog.title, 'Linked With', 'Linked with dialog is opened'); - const link_tables_count = cur_dialog.$wrapper.find('.list-item-table').length; - assert.equal(link_tables_count, 2, 'Two DocTypes are linked with Contacts'); - }, - done - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_list/test_list_filter.js b/frappe/tests/ui/test_list/test_list_filter.js deleted file mode 100644 index 059122f0c0..0000000000 --- a/frappe/tests/ui/test_list/test_list_filter.js +++ /dev/null @@ -1,39 +0,0 @@ -QUnit.module('views'); - -QUnit.test("Test list filters", function(assert) { - assert.expect(3); - let done = assert.async(); - - frappe.run_serially([ - () => { - return frappe.tests.make('ToDo', [ - {description: 'low priority'}, - {priority: 'Low'} - ]); - }, - () => { - return frappe.tests.make('ToDo', [ - {description: 'high priority'}, - {priority: 'High'} - ]); - }, - () => frappe.set_route('List', 'ToDo', 'List'), - () => frappe.timeout(0.5), - () => { - assert.deepEqual(['List', 'ToDo', 'List'], frappe.get_route(), - "List opened successfully."); - //set filter values - return frappe.set_control('priority', 'Low'); - }, - () => frappe.timeout(0.5), - () => cur_list.page.btn_secondary.click(), - () => frappe.timeout(1), - () => { - assert.equal(cur_list.data[0].priority, 'Low', - 'visible element has low priority'); - let non_low_items = cur_list.data.filter(d => d.priority != 'Low'); - assert.equal(non_low_items.length, 0, 'no item without low priority'); - }, - () => done() - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_list/test_list_paging.js b/frappe/tests/ui/test_list/test_list_paging.js deleted file mode 100644 index b760a11370..0000000000 --- a/frappe/tests/ui/test_list/test_list_paging.js +++ /dev/null @@ -1,25 +0,0 @@ -QUnit.module('views'); - -QUnit.test("Test paging in list view", function(assert) { - assert.expect(5); - let done = assert.async(); - - frappe.run_serially([ - () => frappe.set_route('List', 'DocType'), - () => frappe.timeout(0.5), - () => assert.deepEqual(['List', 'DocType', 'List'], frappe.get_route(), - "List opened successfully."), - //check elements less then page length [20 in this case] - () => assert.equal(cur_list.data.length, 20, 'show 20 items'), - () => frappe.click_button('More'), - () => frappe.timeout(2), - () => assert.equal(cur_list.data.length, 40, 'show more items'), - () => frappe.tests.click_button('100'), - () => frappe.timeout(2), - () => assert.ok(cur_list.data.length > 40, 'show 100 items'), - () => frappe.tests.click_button('20'), - () => frappe.timeout(2), - () => assert.equal(cur_list.data.length, 20, 'show 20 items again'), - () => done() - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_list_count.js b/frappe/tests/ui/test_list_count.js deleted file mode 100644 index 31f73964d2..0000000000 --- a/frappe/tests/ui/test_list_count.js +++ /dev/null @@ -1,33 +0,0 @@ -QUnit.module('Setup'); - -QUnit.test("Test List Count", function(assert) { - assert.expect(3); - const done = assert.async(); - - frappe.run_serially([ - () => frappe.set_route('List', 'DocType'), - () => frappe.timeout(0.5), - () => { - let count = $('.list-count').text().split(' ')[0]; - assert.equal(cur_list.data.length, count, "Correct Count"); - }, - - () => frappe.timeout(1), - () => cur_list.filter_area.add('Doctype', 'module', '=', 'Desk'), - () => frappe.click_button('Refresh'), - () => { - let count = $('.list-count').text().split(' ')[0]; - assert.equal(cur_list.data.length, count, "Correct Count"); - }, - - () => cur_list.filter_area.clear(), - () => frappe.timeout(1), - () => { - cur_list.filter_area.add('DocField', 'fieldname', 'like', 'owner'); - let count = $('.list-count').text().split(' ')[0]; - assert.equal(cur_list.data.length, count, "Correct Count"); - }, - - done - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_module_view.js b/frappe/tests/ui/test_module_view.js deleted file mode 100644 index 7340945b29..0000000000 --- a/frappe/tests/ui/test_module_view.js +++ /dev/null @@ -1,41 +0,0 @@ -QUnit.module('views'); - -QUnit.test("Test modules view", function(assert) { - assert.expect(4); - let done = assert.async(); - - frappe.run_serially([ - - //click Document Share Report in Permissions section [Report] - () => frappe.set_route("modules", "Setup"), - () => frappe.timeout(0.5), - () => frappe.click_link('Document Share Report'), - () => assert.deepEqual(frappe.get_route(), ["List", "DocShare", "Report", "Document Share Report"], - 'document share report'), - - //click Print Setting in Printing section [Form] - () => frappe.set_route("modules", "Setup"), - () => frappe.timeout(0.5), - () => frappe.click_link('Print Settings'), - () => assert.deepEqual(frappe.get_route(), ["Form", "Print Settings"], - 'print settings'), - - //click Workflow Action in Workflow section [List] - () => frappe.set_route("modules", "Setup"), - () => frappe.timeout(0.5), - () => frappe.click_link('Workflow Action'), - () => assert.deepEqual(frappe.get_route(), ["List", "Workflow Action", "List"], - 'workflow action'), - - //click Workflow Action in Workflow section [List] - () => frappe.set_route("modules"), - () => frappe.timeout(0.5), - () => frappe.click_link('Tools'), - () => frappe.timeout(0.5), - () => frappe.click_link('To Do'), - () => assert.deepEqual(frappe.get_route(), ["List", "ToDo", "List"], - 'todo list'), - - () => done() - ]); -}); diff --git a/frappe/tests/ui/test_number_format.js b/frappe/tests/ui/test_number_format.js deleted file mode 100644 index 2bca7d92f6..0000000000 --- a/frappe/tests/ui/test_number_format.js +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -// MIT License. See license.txt - -QUnit.module("Number Formatting"); - -QUnit.test("#,###.##", function(assert) { - assert.equal(format_number(100, "#,###.##"), "100.00"); - assert.equal(format_number(1000, "#,###.##"), "1,000.00"); - assert.equal(format_number(10000, "#,###.##"), "10,000.00"); - assert.equal(format_number(1000000, "#,###.##"), "1,000,000.00"); - assert.equal(format_number(1000000.345, "#,###.##"), "1,000,000.35"); -}); - -QUnit.test("#,##,###.##", function(assert) { - assert.equal(format_number(100, "#,##,###.##"), "100.00"); - assert.equal(format_number(1000, "#,##,###.##"), "1,000.00"); - assert.equal(format_number(10000, "#,##,###.##"), "10,000.00"); - assert.equal(format_number(1000000, "#,##,###.##"), "10,00,000.00"); - assert.equal(format_number(1000000.341, "#,##,###.##"), "10,00,000.34"); - assert.equal(format_number(10000000.341, "#,##,###.##"), "1,00,00,000.34"); -}); - -QUnit.test("#.###,##", function(assert) { - assert.equal(format_number(100, "#.###,##"), "100,00"); - assert.equal(format_number(1000, "#.###,##"), "1.000,00"); - assert.equal(format_number(10000, "#.###,##"), "10.000,00"); - assert.equal(format_number(1000000, "#.###,##"), "1.000.000,00"); - assert.equal(format_number(1000000.345, "#.###,##"), "1.000.000,35"); -}); - -QUnit.test("#.###", function(assert) { - assert.equal(format_number(100, "#.###"), "100"); - assert.equal(format_number(1000, "#.###"), "1.000"); - assert.equal(format_number(10000, "#.###"), "10.000"); - assert.equal(format_number(-100000, "#.###"), "-100.000"); - assert.equal(format_number(1000000, "#.###"), "1.000.000"); - assert.equal(format_number(1000000.345, "#.###"), "1.000.000"); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_social_login_key_buttons.py b/frappe/tests/ui/test_social_login_key_buttons.py deleted file mode 100644 index 376d4139e4..0000000000 --- a/frappe/tests/ui/test_social_login_key_buttons.py +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt -from __future__ import unicode_literals - -import unittest, frappe, time -from frappe.utils.selenium_testdriver import TestDriver - -class TestSocialLoginKeyButtons(unittest.TestCase): - def setUp(self): - try: - frappe_login_key = frappe.get_doc("Social Login Key", "frappe") - except frappe.DoesNotExistError: - frappe_login_key = frappe.new_doc("Social Login Key") - frappe_login_key.get_social_login_provider("Frappe", initialize=True) - frappe_login_key.base_url = "http://localhost:8000" - frappe_login_key.enable_social_login = 1 - frappe_login_key.client_id = "test_client_id" - frappe_login_key.client_secret = "test_client_secret" - frappe_login_key.save() - - self.driver = TestDriver() - - def test_login_buttons(self): - - # Go to Login Page - self.driver.get("login") - - time.sleep(2) - frappe_social_login = self.driver.find(".btn-frappe") - self.assertTrue(len(frappe_social_login) > 0) - - def tearDown(self): - self.driver.close() diff --git a/frappe/tests/ui/test_test_runner.py b/frappe/tests/ui/test_test_runner.py deleted file mode 100644 index 8b207cd02d..0000000000 --- a/frappe/tests/ui/test_test_runner.py +++ /dev/null @@ -1,84 +0,0 @@ -from __future__ import print_function, unicode_literals -from frappe.utils.selenium_testdriver import TestDriver -import unittest, os, frappe, time - -class TestTestRunner(unittest.TestCase): - def test_test_runner(self): - if frappe.flags.run_setup_wizard_ui_test: - for setup_wizard_test in frappe.get_hooks("setup_wizard_test"): - passed = frappe.get_attr(setup_wizard_test)() - self.assertTrue(passed) - return - - driver = TestDriver() - frappe.db.set_default('in_selenium', '1') - driver.login() - for test in get_tests(): - if test.startswith('#'): - continue - - timeout = 60 - passed = False - if '#' in test: - test, comment = test.split('#') - test = test.strip() - if comment.strip()=='long': - timeout = 300 - - print('Running {0}...'.format(test)) - - frappe.db.set_value('Test Runner', None, 'module_path', test) - frappe.db.commit() - driver.refresh() - driver.set_route('Form', 'Test Runner') - try: - driver.click_primary_action() - driver.wait_for('#frappe-qunit-done', timeout=timeout) - console = driver.get_console() - passed = 'Tests Passed' in console - finally: - console = driver.get_console() - passed = 'Test Passed' in console - if frappe.flags.tests_verbose or not passed: - for line in console: - print(line) - print('-' * 40) - else: - self.assertTrue(passed) - time.sleep(1) - frappe.db.set_default('in_selenium', None) - driver.close() - -def get_tests(): - '''Get tests base on flag''' - frappe.db.set_value('Test Runner', None, 'app', frappe.flags.ui_test_app or '') - - if frappe.flags.ui_test_list: - # list of tests - return get_tests_for(test_list=frappe.flags.ui_test_list) - elif frappe.flags.ui_test_path: - # specific test - return (frappe.flags.ui_test_path,) - elif frappe.flags.ui_test_app: - # specific app - return get_tests_for(frappe.flags.ui_test_app) - else: - # all apps - tests = [] - for app in frappe.get_installed_apps(): - tests.extend(get_tests_for(app)) - return tests - -def get_tests_for(app=None, test_list=None): - tests = [] - if test_list: - # Get all tests from a particular txt file - app, test_list = test_list.split(os.path.sep, 1) - tests_path = frappe.get_app_path(app, test_list) - else: - # Get all tests for a particular app - tests_path = frappe.get_app_path(app, 'tests', 'ui', 'tests.txt') - if os.path.exists(tests_path): - with open(tests_path, 'r') as fileobj: - tests = fileobj.read().strip().splitlines() - return tests diff --git a/frappe/tests/ui/test_todo.py b/frappe/tests/ui/test_todo.py deleted file mode 100644 index bb367e7851..0000000000 --- a/frappe/tests/ui/test_todo.py +++ /dev/null @@ -1,50 +0,0 @@ -from __future__ import print_function, unicode_literals -from frappe.utils.selenium_testdriver import TestDriver -import unittest -import time, os - -class TestToDo(unittest.TestCase): - def setUp(self): - self.driver = TestDriver() - - def test_todo(self): - self.driver.login() - - # list view - self.driver.set_route('List', 'ToDo') - - time.sleep(2) - - # new - self.driver.click_primary_action() - - time.sleep(2) - - # set input - self.driver.set_text_editor('description', 'hello') - - # save - self.driver.click_modal_primary_action() - - time.sleep(2) - - # refresh - self.driver.click_secondary_action() - - time.sleep(2) - - result_list = self.driver.get_visible_element('.result-list') - first_element_text = (result_list - .find_element_by_css_selector('.list-item') - .find_element_by_css_selector('.list-id').text) - - # if os.environ.get('CI'): - # # we don't run this test in Travis as it always fails - # # reinforcing why we use Unit Testing instead of integration - # # testing - # return - - self.assertTrue('hello' in first_element_text) - - def tearDown(self): - self.driver.close() diff --git a/frappe/tests/ui/tests.txt b/frappe/tests/ui/tests.txt deleted file mode 100644 index 2fcbf64851..0000000000 --- a/frappe/tests/ui/tests.txt +++ /dev/null @@ -1,20 +0,0 @@ -frappe/tests/ui/test_number_format.js -frappe/tests/ui/test_list/test_list_filter.js -frappe/tests/ui/test_list/test_list_paging.js -frappe/tests/ui/test_module_view.js -frappe/tests/ui/test_calendar_view.js -frappe/tests/ui/test_kanban/test_kanban_creation.js -frappe/tests/ui/test_kanban/test_kanban_view.js -frappe/tests/ui/test_kanban/test_kanban_filters.js -frappe/tests/ui/test_kanban/test_kanban_column.js -frappe/core/doctype/report/test_query_report.js -frappe/tests/ui/test_linked_with.js -frappe/custom/doctype/customize_form/test_customize_form.js -frappe/desk/doctype/event/test_event.js -frappe/tests/ui/test_control_html.js -frappe/tests/ui/test_control_geolocation.js -frappe/core/doctype/role_profile/test_role_profile.js -frappe/core/doctype/user/test_user_with_role_profile.js -frappe/tests/ui/test_list_count.js -frappe/workflow/doctype/workflow/tests/test_workflow_create.js -frappe/workflow/doctype/workflow/tests/test_workflow_test.js \ No newline at end of file diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index 3747eaa75b..3a58fbc379 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -63,3 +63,32 @@ def setup_workflow(): create_todo_workflow() create_todo_records() frappe.clear_cache() + +@frappe.whitelist() +def create_contact_phone_nos_records(): + if frappe.db.get_all('Contact', {'first_name': 'Test Contact'}): + return + + doc = frappe.new_doc('Contact') + doc.first_name = 'Test Contact' + for index in range(1000): + doc.append('phone_nos', {'phone': '123456{}'.format(index)}) + doc.insert() + +@frappe.whitelist() +def create_contact_records(): + if frappe.db.get_all('Contact', {'first_name': 'Test Form Contact 1'}): + return + + insert_contact('Test Form Contact 1', '12345') + insert_contact('Test Form Contact 2', '54321') + insert_contact('Test Form Contact 3', '12345') + + +def insert_contact(first_name, phone_number): + doc = frappe.get_doc({ + 'doctype': 'Contact', + 'first_name': first_name + }) + doc.append('phone_nos', {'phone': phone_number}) + doc.insert() \ No newline at end of file diff --git a/frappe/twofactor.py b/frappe/twofactor.py index a539532f25..e60113215b 100644 --- a/frappe/twofactor.py +++ b/frappe/twofactor.py @@ -248,9 +248,7 @@ def get_link_for_qrcode(user, totp_uri): key = frappe.generate_hash(length=20) key_user = "{}_user".format(key) key_uri = "{}_uri".format(key) - lifespan = int(frappe.db.get_value('System Settings', 'System Settings', 'lifespan_qrcode_image')) - if lifespan<=0: - lifespan = 240 + lifespan = int(frappe.db.get_value('System Settings', 'System Settings', 'lifespan_qrcode_image')) or 240 frappe.cache().set_value(key_uri, totp_uri, expires_in_sec=lifespan) frappe.cache().set_value(key_user, user, expires_in_sec=lifespan) return get_url('/qrcode?k={}'.format(key)) @@ -387,7 +385,7 @@ def should_remove_barcode_image(barcode): '''Check if it's time to delete barcode image from server. ''' if isinstance(barcode, string_types): barcode = frappe.get_doc('File', barcode) - lifespan = frappe.db.get_value('System Settings', 'System Settings', 'lifespan_qrcode_image') + lifespan = frappe.db.get_value('System Settings', 'System Settings', 'lifespan_qrcode_image') or 240 if time_diff_in_seconds(get_datetime(), barcode.creation) > int(lifespan): return True return False diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index 29c9387248..82e6ea1b45 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -679,3 +679,16 @@ def create_batch(iterable, batch_size): total_count = len(iterable) for i in range(0, total_count, batch_size): yield iterable[i:min(i + batch_size, total_count)] + +def set_request(**kwargs): + from werkzeug.test import EnvironBuilder + from werkzeug.wrappers import Request + builder = EnvironBuilder(**kwargs) + frappe.local.request = Request(builder.get_environ()) + +def get_html_for_route(route): + from frappe.website import render + set_request(method='GET', path=route) + response = render.render() + html = frappe.safe_decode(response.get_data()) + return html \ No newline at end of file diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py index ef345c67df..c1ac7581dc 100755 --- a/frappe/utils/background_jobs.py +++ b/frappe/utils/background_jobs.py @@ -79,8 +79,6 @@ def run_doc_method(doctype, name, doc_method, **kwargs): def execute_job(site, method, event, job_name, kwargs, user=None, is_async=True, retry=0): '''Executes job in a worker, performs commit/rollback and logs if there is any error''' - from frappe.utils.scheduler import log - if is_async: frappe.connect(site) if os.environ.get('CI'): @@ -115,12 +113,14 @@ def execute_job(site, method, event, job_name, kwargs, user=None, is_async=True, is_async=is_async, retry=retry+1) else: - log(method_name, message=repr(locals())) + frappe.log_error(method_name) raise except: frappe.db.rollback() - log(method_name, message=repr(locals())) + frappe.log_error(method_name) + frappe.db.commit() + print(frappe.get_traceback()) raise else: @@ -142,8 +142,6 @@ def start_worker(queue=None, quiet = False): with Connection(redis_connection): queues = get_queue_list(queue) logging_level = "INFO" - if quiet: - logging_level = "WARNING" Worker(queues, name=get_worker_name(queue)).work(logging_level = logging_level) def get_worker_name(queue): @@ -162,18 +160,25 @@ def get_worker_name(queue): def get_jobs(site=None, queue=None, key='method'): '''Gets jobs per queue or per site or both''' jobs_per_site = defaultdict(list) + + def add_to_dict(job): + if key in job.kwargs: + jobs_per_site[job.kwargs['site']].append(job.kwargs[key]) + + elif key in job.kwargs.get('kwargs', {}): + # optional keyword arguments are stored in 'kwargs' of 'kwargs' + jobs_per_site[job.kwargs['site']].append(job.kwargs['kwargs'][key]) + for queue in get_queue_list(queue): q = get_queue(queue) for job in q.jobs: if job.kwargs.get('site'): if site is None: - # get jobs for all sites - jobs_per_site[job.kwargs['site']].append(job.kwargs[key]) + add_to_dict(job) elif job.kwargs['site'] == site: - # get jobs only for given site - jobs_per_site[site].append(job.kwargs[key]) + add_to_dict(job) else: print('No site found in job', job.__dict__) @@ -198,13 +203,7 @@ def get_queue_list(queue_list=None): def get_queue(queue, is_async=True): '''Returns a Queue object tied to a redis connection''' validate_queue(queue) - - kwargs = { - 'connection': get_redis_conn(), - 'async': is_async - } - - return Queue(queue, **kwargs) + return Queue(queue, connection=get_redis_conn(), is_async=is_async) def validate_queue(queue, default_queue_list=None): if not default_queue_list: diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 8e407736bd..77d43b3778 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -681,13 +681,13 @@ def pretty_date(iso_datetime): else: return '{0} years ago'.format(cint(math.floor(dt_diff_days / 365.0))) -def comma_or(some_list): - return comma_sep(some_list, frappe._("{0} or {1}")) +def comma_or(some_list, add_quotes=True): + return comma_sep(some_list, frappe._("{0} or {1}"), add_quotes) -def comma_and(some_list): - return comma_sep(some_list, frappe._("{0} and {1}")) +def comma_and(some_list ,add_quotes=True): + return comma_sep(some_list, frappe._("{0} and {1}"), add_quotes) -def comma_sep(some_list, pattern): +def comma_sep(some_list, pattern, add_quotes=True): if isinstance(some_list, (list, tuple)): # list(some_list) is done to preserve the existing list some_list = [text_type(s) for s in list(some_list)] @@ -696,7 +696,7 @@ def comma_sep(some_list, pattern): elif len(some_list) == 1: return some_list[0] else: - some_list = ["'%s'" % s for s in some_list] + some_list = ["'%s'" % s for s in some_list] if add_quotes else ["%s" % s for s in some_list] return pattern.format(", ".join(frappe._(s) for s in some_list[:-1]), some_list[-1]) else: return some_list diff --git a/frappe/utils/formatters.py b/frappe/utils/formatters.py index 1574ae9ace..46e3694e6f 100644 --- a/frappe/utils/formatters.py +++ b/frappe/utils/formatters.py @@ -55,12 +55,15 @@ def format_value(value, df=None, doc=None, currency=None, translated=False): # this is required to show 0 as blank in table columns return "" - elif df.get("fieldtype") == "Currency" or (df.get("fieldtype")=="Float" and (df.options or "").strip()): - return fmt_money(value, precision=get_field_precision(df, doc), - currency=currency if currency else (get_field_currency(df, doc) if doc else None)) + elif df.get("fieldtype") == "Currency": + default_currency = frappe.db.get_default("currency") + currency = currency or get_field_currency(df, doc) or default_currency + return fmt_money(value, precision=get_field_precision(df, doc), currency=currency) elif df.get("fieldtype") == "Float": precision = get_field_precision(df, doc) + # I don't know why we support currency option for float + currency = currency or get_field_currency(df, doc) # show 1.000000 as 1 # options should not specified @@ -69,7 +72,7 @@ def format_value(value, df=None, doc=None, currency=None, translated=False): if len(temp)==1 or cint(temp[1])==0: precision = 0 - return fmt_money(value, precision=precision) + return fmt_money(value, precision=precision, currency=currency) elif df.get("fieldtype") == "Percent": return "{}%".format(flt(value, 2)) diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index 447466770d..7012b737c0 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -302,7 +302,7 @@ def get_routes_to_index(): def add_route_to_global_search(route): from frappe.website.render import render_page - from frappe.tests.test_website import set_request + from frappe.utils import set_request frappe.set_user('Guest') frappe.local.no_cache = True @@ -418,25 +418,31 @@ def search(text, start=0, limit=20, doctype=""): from frappe.desk.doctype.global_search_settings.global_search_settings import get_doctypes_for_global_search results = [] - texts = [t.strip() for t in text.split('&') if t] - priorities = get_doctypes_for_global_search() - allowed_doctypes = ",".join(["'{0}'".format(dt) for dt in priorities]) - for text in texts: - mariadb_conditions = '' - postgres_conditions = '' - offset = '' + sorted_results = [] - if doctype: - mariadb_conditions = postgres_conditions = '`doctype` = {} AND '.format(frappe.db.escape(doctype)) + allowed_doctypes = get_doctypes_for_global_search() + + for text in set(text.split('&')): + text = text.strip() + if not text: + continue + + conditions = '1=1' + offset = '' mariadb_text = frappe.db.escape('+' + text + '*') mariadb_fields = '`doctype`, `name`, `content`, MATCH (`content`) AGAINST ({} IN BOOLEAN MODE) AS rank'.format(mariadb_text) postgres_fields = '`doctype`, `name`, `content`, TO_TSVECTOR("content") @@ PLAINTO_TSQUERY({}) AS rank'.format(frappe.db.escape(text)) - if allowed_doctypes: - mariadb_conditions += '`doctype` IN ({})'.format(allowed_doctypes) - postgres_conditions += '`doctype` IN ({})'.format(allowed_doctypes) + values = {} + + if doctype: + conditions = '`doctype` = %(doctype)s' + values['doctype'] = doctype + elif allowed_doctypes: + conditions = '`doctype` IN %(allowed_doctypes)s' + values['allowed_doctypes'] = tuple(allowed_doctypes) if int(start) > 0: offset = 'OFFSET {}'.format(start) @@ -451,41 +457,27 @@ def search(text, start=0, limit=20, doctype=""): """ result = frappe.db.multisql({ - 'mariadb': common_query.format(fields=mariadb_fields, conditions=mariadb_conditions, limit=limit, offset=offset), - 'postgres': common_query.format(fields=postgres_fields, conditions=postgres_conditions, limit=limit, offset=offset) - }, as_dict=True) + 'mariadb': common_query.format(fields=mariadb_fields, conditions=conditions, limit=limit, offset=offset), + 'postgres': common_query.format(fields=postgres_fields, conditions=conditions, limit=limit, offset=offset) + }, values=values, as_dict=True) - tmp_result=[] - for i in result: - if i.rank > 0.0: - if i in results or not results: - tmp_result.extend([i]) - results.extend(tmp_result) - - for r in results: - try: - if frappe.get_meta(r.doctype).image_field: - r.image = frappe.db.get_value(r.doctype, r.name, frappe.get_meta(r.doctype).image_field) - except Exception: - frappe.clear_messages() - - sorted_results = [] - - for priority in priorities: - tmp_result = [] - if not results: - break + results.extend(result) + # sort results based on allowed_doctype's priority + for doctype in allowed_doctypes: for index, r in enumerate(results): - if r.doctype == priority: - tmp_result.extend([r]) - results.pop(index) + if r.doctype == doctype and r.rank > 0.0: + try: + meta = frappe.get_meta(r.doctype) + if meta.image_field: + r.image = frappe.db.get_value(r.doctype, r.name, meta.image_field) + except Exception: + frappe.clear_messages() - sorted_results.extend(tmp_result) + sorted_results.extend([r]) return sorted_results - @frappe.whitelist(allow_guest=True) def web_search(text, scope=None, start=0, limit=20): """ diff --git a/frappe/utils/oauth.py b/frappe/utils/oauth.py index 79bcee7a74..969623c369 100644 --- a/frappe/utils/oauth.py +++ b/frappe/utils/oauth.py @@ -283,6 +283,12 @@ def update_oauth_user(user, data, provider): if save: user.flags.ignore_permissions = True user.flags.no_welcome_mail = True + + # set default signup role as per Portal Settings + default_role = frappe.db.get_single_value("Portal Settings", "default_role") + if default_role: + user.add_roles(default_role) + user.save() def get_first_name(data): diff --git a/frappe/utils/redis_wrapper.py b/frappe/utils/redis_wrapper.py index cb92ced5c6..4af59bceb2 100644 --- a/frappe/utils/redis_wrapper.py +++ b/frappe/utils/redis_wrapper.py @@ -43,7 +43,7 @@ class RedisWrapper(redis.Redis): try: if expires_in_sec: - self.setex(key, pickle.dumps(val), expires_in_sec) + self.setex(key, expires_in_sec, pickle.dumps(val)) else: self.set(key, pickle.dumps(val)) @@ -141,6 +141,9 @@ class RedisWrapper(redis.Redis): return super(RedisWrapper, self).llen(self.make_key(key)) def hset(self, name, key, value, shared=False): + if key is None: + return + _name = self.make_key(name, shared=shared) # set in local @@ -164,6 +167,8 @@ class RedisWrapper(redis.Redis): if not _name in frappe.local.cache: frappe.local.cache[_name] = {} + if not key: return None + if key in frappe.local.cache[_name]: return frappe.local.cache[_name][key] diff --git a/frappe/utils/response.py b/frappe/utils/response.py index 8169986e44..1dfbbe5516 100644 --- a/frappe/utils/response.py +++ b/frappe/utils/response.py @@ -210,7 +210,7 @@ def send_private_file(path): blacklist = ['.svg', '.html', '.htm', '.xml'] if extension.lower() in blacklist: - response.headers.add(b'Content-Disposition', b'attachment', filename=filename.encode("utf-8")) + response.headers.add('Content-Disposition', 'attachment', filename=filename.encode("utf-8")) response.mimetype = mimetypes.guess_type(filename)[0] or 'application/octet-stream' diff --git a/frappe/utils/scheduler.py b/frappe/utils/scheduler.py index b46036d996..708bec887f 100755 --- a/frappe/utils/scheduler.py +++ b/frappe/utils/scheduler.py @@ -10,38 +10,16 @@ Events: from __future__ import unicode_literals, print_function -import frappe -import json +import frappe, os, time import schedule -import time -import frappe.utils -import os +from frappe.utils import now_datetime, get_datetime from frappe.utils import get_sites -from datetime import datetime -from frappe.utils.background_jobs import enqueue, get_jobs, queue_timeout -from frappe.utils.data import get_datetime, now_datetime -from frappe.core.doctype.user.user import STANDARD_USERS from frappe.installer import update_site_config -from six import string_types -from croniter import croniter +from frappe.core.doctype.user.user import STANDARD_USERS +from frappe.utils.background_jobs import get_jobs DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S' -cron_map = { - "yearly": "0 0 1 1 *", - "annual": "0 0 1 1 *", - "monthly": "0 0 1 * *", - "monthly_long": "0 0 1 * *", - "weekly": "0 0 * * 0", - "weekly_long": "0 0 * * 0", - "daily": "0 0 * * *", - "daily_long": "0 0 * * *", - "midnight": "0 0 * * *", - "hourly": "0 * * * *", - "hourly_long": "0 * * * *", - "all": "0/" + str((frappe.get_conf().scheduler_interval or 240) // 60) + " * * * *", -} - def start_scheduler(): '''Run enqueue_events_for_all_sites every 2 minutes (default). Specify scheduler_interval in seconds in common_site_config.json''' @@ -60,17 +38,16 @@ def enqueue_events_for_all_sites(): return with frappe.init_site(): - jobs_per_site = get_jobs() sites = get_sites() for site in sites: try: - enqueue_events_for_site(site=site, queued_jobs=jobs_per_site[site]) + enqueue_events_for_site(site=site) except: # it should try to enqueue other sites print(frappe.get_traceback()) -def enqueue_events_for_site(site, queued_jobs): +def enqueue_events_for_site(site): def log_and_raise(): frappe.logger(__name__).error('Exception in Enqueue Events for Site {0}'.format(site) + '\n' + frappe.get_traceback()) @@ -82,7 +59,7 @@ def enqueue_events_for_site(site, queued_jobs): if is_scheduler_inactive(): return - enqueue_events(site=site, queued_jobs=queued_jobs) + enqueue_events(site=site) frappe.logger(__name__).debug('Queued events for site {0}'.format(site)) except frappe.db.OperationalError as e: @@ -96,128 +73,14 @@ def enqueue_events_for_site(site, queued_jobs): finally: frappe.destroy() -def enqueue_events(site, queued_jobs): - nowtime = frappe.utils.now_datetime() - last = frappe.db.get_value('System Settings', 'System Settings', 'scheduler_last_event') - - # set scheduler last event - frappe.db.set_value('System Settings', 'System Settings', - 'scheduler_last_event', nowtime.strftime(DATETIME_FORMAT), - update_modified=False) - frappe.db.commit() - - out = [] - if last: - last = datetime.strptime(last, DATETIME_FORMAT) - out = enqueue_applicable_events(site, nowtime, last, queued_jobs) - - return '\n'.join(out) - -def enqueue_applicable_events(site, nowtime, last, queued_jobs=()): - nowtime_str = nowtime.strftime(DATETIME_FORMAT) - out = [] - - enabled_events = get_enabled_scheduler_events() - - def trigger_if_enabled(site, event, last, queued_jobs): - trigger(site, event, last, queued_jobs) - _log(event) - - def _log(event): - out.append("{time} - {event} - queued".format(time=nowtime_str, event=event)) - - for event in enabled_events: - trigger_if_enabled(site, event, last, queued_jobs) - - if "all" not in enabled_events: - trigger_if_enabled(site, "all", last, queued_jobs) - - return out - -def trigger(site, event, last=None, queued_jobs=(), now=False): - """Trigger method in hooks.scheduler_events.""" - - queue = 'long' if event.endswith('_long') else 'short' - timeout = queue_timeout[queue] - if not queued_jobs and not now: - queued_jobs = get_jobs(site=site, queue=queue) - - if frappe.flags.in_test: - frappe.flags.ran_schedulers.append(event) - - events_from_hooks = get_scheduler_events(event) - if not events_from_hooks: - return - - events = events_from_hooks - if not now: - events = [] - if event == "cron": - for e in events_from_hooks: - e = cron_map.get(e, e) - if croniter.is_valid(e): - if croniter(e, last).get_next(datetime) <= frappe.utils.now_datetime(): - events.extend(events_from_hooks[e]) - else: - frappe.log_error("Cron string " + e + " is not valid", "Error triggering cron job") - frappe.logger(__name__).error('Exception in Trigger Events for Site {0}, Cron String {1}'.format(site, e)) - - else: - if croniter(cron_map[event], last).get_next(datetime) <= frappe.utils.now_datetime(): - events.extend(events_from_hooks) - - for handler in events: - if not now: - if handler not in queued_jobs: - enqueue(handler, queue, timeout, event) - else: - scheduler_task(site=site, event=event, handler=handler, now=True) - -def get_scheduler_events(event): - '''Get scheduler events from hooks and integrations''' - scheduler_events = frappe.cache().get_value('scheduler_events') - if not scheduler_events: - scheduler_events = frappe.get_hooks("scheduler_events") - frappe.cache().set_value('scheduler_events', scheduler_events) - - return scheduler_events.get(event) or [] - -def log(method, message=None): - """log error in patch_log""" - message = frappe.utils.cstr(message) + "\n" if message else "" - message += frappe.get_traceback() - - if not (frappe.db and frappe.db._conn): - frappe.connect() - - frappe.db.rollback() - frappe.db.begin() - - d = frappe.new_doc("Error Log") - d.method = method - d.error = message - d.insert(ignore_permissions=True) - - frappe.db.commit() - - return message - -def get_enabled_scheduler_events(): - if 'enabled_events' in frappe.flags and frappe.flags.enabled_events: - return frappe.flags.enabled_events - - enabled_events = frappe.db.get_global("enabled_scheduler_events") - if frappe.flags.in_test: - # TEMP for debug: this test fails randomly - print('found enabled_scheduler_events {0}'.format(enabled_events)) - - if enabled_events: - if isinstance(enabled_events, string_types): - enabled_events = json.loads(enabled_events) - return enabled_events - - return ["all", "hourly", "hourly_long", "daily", "daily_long", - "weekly", "weekly_long", "monthly", "monthly_long", "cron"] +def enqueue_events(site): + if schedule_jobs_based_on_activity(): + frappe.flags.enqueued_jobs = [] + queued_jobs = get_jobs(site=site, key='job_type').get(site) or [] + for job_type in frappe.get_all('Scheduled Job Type', ('name', 'method'), dict(stopped=0)): + if not job_type.method in queued_jobs: + # don't add it to queue if still pending + frappe.get_doc('Scheduled Job Type', job_type.name).enqueue() def is_scheduler_inactive(): if frappe.local.conf.maintenance_mode: @@ -246,97 +109,34 @@ def enable_scheduler(): def disable_scheduler(): toggle_scheduler(False) -def get_errors(from_date, to_date, limit): - errors = frappe.db.sql("""select modified, method, error from `tabError Log` - where date(modified) between %s and %s - and error not like '%%[Errno 110] Connection timed out%%' - order by modified limit %s""", (from_date, to_date, limit), as_dict=True) - return ["""Time: {modified}
Method: {method}\n{error}Error Logs (max {limit}):
-URL: {url}
{errors}""".format( - limit=limit, url=get_url(), errors="
".join(errors)) - else: - return 0, "
No error logs
" - -def scheduler_task(site, event, handler, now=False): - '''This is a wrapper function that runs a hooks.scheduler_events method''' - frappe.logger(__name__).info('running {handler} for {site} for event: {event}'.format(handler=handler, site=site, event=event)) - try: - if not now: - frappe.connect(site=site) - - frappe.flags.in_scheduler = True - frappe.get_attr(handler)() - - except Exception: - frappe.db.rollback() - traceback = log(handler, "Method: {event}, Handler: {handler}".format(event=event, handler=handler)) - frappe.logger(__name__).error(traceback) - raise - - else: - frappe.db.commit() - - frappe.logger(__name__).info('ran {handler} for {site} for event: {event}'.format(handler=handler, site=site, event=event)) - - -def reset_enabled_scheduler_events(login_manager): - if login_manager.info.user_type == "System User": - try: - if frappe.db.get_global('enabled_scheduler_events'): - # clear restricted events, someone logged in! - frappe.db.set_global('enabled_scheduler_events', None) - except frappe.db.InternalError as e: - if frappe.db.is_timedout(e): - frappe.log_error(frappe.get_traceback(), "Error in reset_enabled_scheduler_events") - else: - raise +def schedule_jobs_based_on_activity(check_time=None): + '''Returns True for active sites defined by Activity Log + Returns True for inactive sites once in 24 hours''' + if is_dormant(check_time=check_time): + # ensure last job is one day old + last_job_timestamp = frappe.db.get_last_created('Scheduled Job Log') + if not last_job_timestamp: + return True else: - is_dormant = frappe.conf.get('dormant') - if is_dormant: - update_site_config('dormant', 'None') + if ((check_time or now_datetime()) - last_job_timestamp).total_seconds() >= 86400: + # one day is passed since jobs are run, so lets do this + return True + else: + # schedulers run in the last 24 hours, do nothing + return False + else: + # site active, lets run the jobs + return True - -def restrict_scheduler_events_if_dormant(): - if is_dormant(): - restrict_scheduler_events() - update_site_config('dormant', True) - -def restrict_scheduler_events(*args, **kwargs): - val = json.dumps(["hourly", "hourly_long", "daily", "daily_long", "weekly", "weekly_long", "monthly", "monthly_long", "cron"]) - frappe.db.set_global('enabled_scheduler_events', val) - -def is_dormant(since = 345600): - last_user_activity = get_last_active() - if not last_user_activity: - # no user has ever logged in, so not yet used - return False - last_active = get_datetime(last_user_activity) - # Get now without tz info - now = now_datetime().replace(tzinfo=None) - time_since_last_active = now - last_active - if time_since_last_active.total_seconds() > since: # 4 days +def is_dormant(check_time=None): + last_activity_log_timestamp = frappe.db.get_last_created('Activity Log') + since = (frappe.get_system_settings('dormant_days') or 4) * 86400 + if not last_activity_log_timestamp: + return True + if ((check_time or now_datetime()) - last_activity_log_timestamp).total_seconds() >= since: return True return False -def get_last_active(): - return frappe.db.sql("""SELECT MAX(`last_active`) FROM `tabUser` - WHERE `user_type` = 'System User' AND `name` NOT IN ({standard_users})""" - .format(standard_users=", ".join(["%s"]*len(STANDARD_USERS))), - STANDARD_USERS)[0][0] @frappe.whitelist() def activate_scheduler(): diff --git a/frappe/utils/selenium_testdriver.py b/frappe/utils/selenium_testdriver.py deleted file mode 100644 index cde0e5cb45..0000000000 --- a/frappe/utils/selenium_testdriver.py +++ /dev/null @@ -1,299 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt - -from __future__ import unicode_literals, print_function - -from selenium import webdriver -from selenium.webdriver.common.by import By -from selenium.webdriver.support.ui import WebDriverWait -#from selenium.webdriver.support.select import Select -from selenium.webdriver.support import expected_conditions as EC -#from selenium.common.exceptions import TimeoutException -from selenium.webdriver.chrome.options import Options -from selenium.webdriver.common.desired_capabilities import DesiredCapabilities - -import time -import signal -import os, sys -import frappe -from ast import literal_eval - -class TestDriver(object): - def __init__(self, port=None): - self.port = port or frappe.get_site_config().webserver_port or '8000' - - chrome_options = Options() - capabilities = DesiredCapabilities.CHROME - - if os.environ.get('CI'): - self.host = 'localhost' - else: - self.host = frappe.local.site - - # enable browser logging - capabilities['loggingPrefs'] = {'browser':'ALL'} - - chrome_options.add_argument('--no-sandbox') - chrome_options.add_argument('--start-maximized') - self.driver = webdriver.Chrome(chrome_options=chrome_options, - desired_capabilities=capabilities, port=9515) - - # self.driver.set_window_size(1080,800) - self.cur_route = None - self.logged_in = False - - @property - def localhost(self): - return "http://{host}:{port}".format(host=self.host, port=self.port) - - def get(self, url): - return self.driver.get(os.path.join(self.localhost, url)) - - def start(self): - def signal_handler(signal, frame): - self.close() - sys.exit(0) - signal.signal(signal.SIGINT, signal_handler) - - def refresh(self): - self.driver.refresh() - - def close(self): - if self.driver: - self.driver.quit() - self.driver = None - - def login(self, wait_for_id="#page-desktop", animate=0, scroll_offset=0): - if self.logged_in: - return - self.get('login') - self.wait_for("#login_email") - self.set_input("#login_email", "Administrator") - self.set_input("#login_password", "admin") - self.click('.btn-login', animate=animate, offset=scroll_offset) - self.wait_for(wait_for_id) - self.logged_in = True - - def set_input(self, selector, text, key=None, xpath=None): - elem = self.find(selector, xpath=xpath)[0] - elem.clear() - elem.send_keys(text) - if key: - time.sleep(0.5) - elem.send_keys(key) - time.sleep(0.2) - - def set_field(self, fieldname, text): - elem = self.wait_for(xpath='//input[@data-fieldname="{0}"]'.format(fieldname)) - time.sleep(0.2) - elem.send_keys(text) - - def set_select(self, fieldname, text): - elem = self.wait_for(xpath='//select[@data-fieldname="{0}"]'.format(fieldname)) - time.sleep(0.2) - elem.send_keys(text) - - def set_multicheck(self, fieldname, values): - for value in values: - path = '//div[@data-fieldname="{0}"]//span[@data-unit="{1}"]'.format(fieldname, value) - elem = self.wait_for(xpath=path) - time.sleep(0.2) - elem.click() - - def set_text_editor(self, fieldname, text): - elem = self.wait_for(xpath='//div[@data-fieldname="{0}"]//div[@contenteditable="true"]'.format(fieldname)) - time.sleep(0.2) - elem.send_keys(text) - - def find(self, selector=None, everywhere=False, xpath=None): - if xpath: - return self.driver.find_elements_by_xpath(xpath) - else: - if self.cur_route and not everywhere: - selector = self.cur_route + " " + selector - return self.driver.find_elements_by_css_selector(selector) - - def wait_for(self, selector=None, everywhere=False, timeout=20, xpath=None, for_invisible=False): - if self.cur_route and not everywhere: - selector = self.cur_route + " " + selector - - time.sleep(0.5) - - if selector: - _by = By.CSS_SELECTOR - if xpath: - _by = By.XPATH - selector = xpath - - try: - if not for_invisible: - elem = self.get_wait(timeout).until( - EC.presence_of_element_located((_by, selector))) - else: - elem = self.get_wait(timeout).until( - EC.invisibility_of_element_located((_by, selector))) - return elem - except Exception as e: - # body = self.driver.find_element_by_id('body_div') - # print(body.get_attribute('innerHTML')) - self.print_console() - raise e - - def wait_for_invisible(self, selector=None, everywhere=False, timeout=20, xpath=None): - self.wait_for(selector, everywhere, timeout, xpath, True) - - def get_console(self): - out = [] - for entry in self.driver.get_log('browser'): - source, line_no, message = entry.get('message').split(' ', 2) - - if message and message[0] in ('"', "'"): - # message is a quoted/escaped string - message = literal_eval(message) - - out.append(source + ' ' + line_no) - out.append(message) - out.append('-'*40) - - return out - - def print_console(self): - for line in self.get_console(): - print(line) - - def get_wait(self, timeout=20): - return WebDriverWait(self.driver, timeout) - - def scroll_to(self, selector, animate=0, offset=0): - self.execute_script("frappe.ui.scroll('{0}', {1}, {2})".format(selector, animate, offset)) - - def set_route(self, *args): - self.execute_script('frappe.set_route({0})'\ - .format(', '.join(['"{0}"'.format(r) for r in args]))) - - self.wait_for(xpath='//div[@data-page-route="{0}"]'.format('/'.join(args)), timeout=4) - - def click(self, css_selector, xpath=None, timeout=20, animate=0, offset=0): - element = self.wait_till_clickable(css_selector, xpath, timeout) - self.scroll_to(css_selector, animate, offset) - time.sleep(0.5) - element.click() - return element - - def click_primary_action(self): - selector = ".page-actions .primary-action" - #self.scroll_to(selector) - self.wait_till_clickable(selector).click() - self.wait_for_ajax() - - def click_secondary_action(self): - selector = ".page-actions .btn-secondary" - #self.scroll_to(selector) - self.wait_till_clickable(selector).click() - self.wait_for_ajax() - - def click_modal_primary_action(self): - self.get_visible_modal().find_element_by_css_selector('.btn-primary').click() - - def get_visible_modal(self): - return self.get_visible_element('.modal-content') - - def get_visible_element(self, selector=None, xpath=None): - for elem in self.find(selector=selector, xpath=xpath): - if elem.is_displayed(): - return elem - - def wait_till_clickable(self, selector=None, xpath=None, timeout=20): - if self.cur_route: - selector = self.cur_route + " " + selector - - by = By.CSS_SELECTOR - if xpath: - by = By.XPATH - selector = xpath - - return self.get_wait(timeout).until(EC.element_to_be_clickable( - (by, selector))) - - - def execute_script(self, js): - self.driver.execute_script(js) - - def wait_for_ajax(self, freeze = False): - self.wait_for('body[data-ajax-state="complete"]', True) - if freeze: - self.wait_for_invisible(".freeze-message-container") - - -# def go_to_module(module_name, item=None): -# global cur_route -# -# # desktop -# find(".navbar-home", True)[0].click() -# cur_route = None -# wait("#page-desktop") -# -# page = "Module/" + module_name -# m = find('#page-desktop [data-link="{0}"] .app-icon'.format(page)) -# if not m: -# page = "List/" + module_name -# m = find('#page-desktop [data-link="{0}"] .app-icon'.format(page)) -# if not m: -# raise Exception("Module {0} not found".format(module_name)) -# -# m[0].click() -# wait_for_page(page) -# -# if item: -# elem = find('[data-label="{0}"]'.format(item))[0] -# elem.click() -# page = elem.get_attribute("data-route") -# wait_for_page(page) -# -# def new_doc(module, doctype): -# go_to_module(module, doctype) -# primary_action() -# wait_for_page("Form/" + doctype) -# -# def add_child(fieldname): -# find('[data-fieldname="{0}"] .grid-add-row'.format(fieldname))[0].click() -# wait('[data-fieldname="{0}"] .form-grid'.format(fieldname)) -# -# def done_add_child(fieldname): -# selector = '[data-fieldname="{0}"] .grid-row-open .btn-success'.format(fieldname) -# scroll_to(selector) -# wait_till_clickable(selector).click() -# -# def set_field(fieldname, value, fieldtype="input"): -# _driver.switch_to.window(_driver.current_window_handle) -# selector = '{0}[data-fieldname="{1}"]'.format(fieldtype, fieldname) -# set_input(selector, value, key=Keys.TAB) -# wait_for_ajax() -# -# def set_select(fieldname, value): -# select = Select(find('select[data-fieldname="{0}"]'.format(fieldname))[0]) -# select.select_by_value(value) -# wait_for_ajax() -# -# -# def wait_for_page(name): -# global cur_route -# cur_route = None -# route = '[data-page-route="{0}"]'.format(name) -# wait_for_ajax() -# elem = wait(route) -# wait_for_ajax() -# cur_route = route -# return elem -# -# -# def wait_till_visible(selector): -# if cur_route: -# selector = cur_route + " " + selector -# return get_wait().until(EC.visibility_of_element_located((By.CSS_SELECTOR, selector))) -# -# -# def wait_for_state(state): -# return wait(cur_route + '[data-state="{0}"]'.format(state), True) -# -# diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index 8278125723..aecc813e9d 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe import unittest -from frappe.tests.test_website import set_request +from frappe.utils import set_request from frappe.website.render import render from frappe.utils import random_string diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py index 38daebe5e8..b1600a338f 100644 --- a/frappe/website/doctype/web_page/test_web_page.py +++ b/frappe/website/doctype/web_page/test_web_page.py @@ -3,7 +3,7 @@ import unittest import frappe from frappe.website.router import resolve_route import frappe.website.render -from frappe.tests import set_request +from frappe.utils import set_request test_records = frappe.get_test_records('Web Page') diff --git a/frappe/website/doctype/website_route_meta/test_website_route_meta.py b/frappe/website/doctype/website_route_meta/test_website_route_meta.py index 90e40972ef..c02dc398bf 100644 --- a/frappe/website/doctype/website_route_meta/test_website_route_meta.py +++ b/frappe/website/doctype/website_route_meta/test_website_route_meta.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import frappe import unittest -from frappe.tests.test_website import set_request +from frappe.utils import set_request from frappe.website.render import render class TestWebsiteRouteMeta(unittest.TestCase): diff --git a/frappe/website/doctype/website_route_meta/website_route_meta.js b/frappe/website/doctype/website_route_meta/website_route_meta.js index f13963e14f..0e41e92b8e 100644 --- a/frappe/website/doctype/website_route_meta/website_route_meta.js +++ b/frappe/website/doctype/website_route_meta/website_route_meta.js @@ -4,5 +4,12 @@ frappe.ui.form.on('Website Route Meta', { refresh: function(frm) { frm.get_field('__newname').set_label('Route'); + frm.add_custom_button(__('Visit Web Page'), () => { + let route = frm.doc.name; + if (!route.startsWith('/')) { + route = '/' + route; + } + window.open(route, '_blank'); + }); } }); diff --git a/frappe/website/doctype/website_route_meta/website_route_meta.json b/frappe/website/doctype/website_route_meta/website_route_meta.json index 1ca6a70fa0..6e1672c379 100644 --- a/frappe/website/doctype/website_route_meta/website_route_meta.json +++ b/frappe/website/doctype/website_route_meta/website_route_meta.json @@ -1,97 +1,43 @@ { - "allow_copy": 0, - "allow_events_in_timeline": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, + "allow_rename": 1, "autoname": "Prompt", - "beta": 0, "creation": "2019-02-16 17:37:27.918909", - "custom": 0, - "docstatus": 0, "doctype": "DocType", - "document_type": "", "editable_grid": 1, "engine": "InnoDB", + "field_order": [ + "meta_tags" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "meta_tags", "fieldtype": "Table", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, "label": "Meta Tags", - "length": 0, - "no_copy": 0, "options": "Website Meta Tag", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "reqd": 1 } ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2019-02-16 17:37:27.918909", + "modified": "2019-11-28 17:26:49.068372", "modified_by": "Administrator", "module": "Website", "name": "Website Route Meta", - "name_case": "", "owner": "Administrator", "permissions": [ { - "amend": 0, - "cancel": 0, "create": 1, "delete": 1, "email": 1, "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, "print": 1, "read": 1, "report": 1, "role": "System Manager", - "set_user_permissions": 0, "share": 1, - "submit": 0, "write": 1 } ], "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0, - "track_views": 0 -} \ No newline at end of file + "track_changes": 1 +} diff --git a/requirements.txt b/requirements.txt index 84788c863e..96e57fd1f7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,68 +1,67 @@ -boto3 -chardet -dropbox==9.1.0 -gunicorn -jinja2 -markdown2==2.3.5 -PyMySQL -maxminddb-geolite2 -python-dateutil -pytz -six -werkzeug -semantic_version -rauth>=0.6.2 -requests -redis==2.10.6 -selenium -babel==2.6.0 -ipython -html2text==2016.9.19 -email_reply_parser -click==7.0 -num2words==0.5.5 -watchdog==0.8.0 +Babel==2.6.0 +beautifulsoup4==4.8.1 +bleach-whitelist==0.0.10 bleach==2.1.4 -bleach-whitelist -Pillow -beautifulsoup4 -rq==0.12.0 -schedule -cryptography -pyopenssl -ndg-httpsclient -pyasn1 -zxcvbn-python -unittest-xml-reporting -oauthlib -requests-oauthlib -pdfkit -PyJWT -PyPDF2 -openpyxl -pyotp -pyqrcode -pypng -premailer -croniter -googlemaps==3.1.1 -braintree -future -passlib -google-api-python-client -google-auth -google-auth-httplib2 -google-auth-oauthlib -faker -stripe -coverage -urllib3 +boto3==1.10.18 +braintree==3.57.1 +chardet==3.0.4 +Click==7.0 +coverage==4.5.4 +croniter==0.3.30 +cryptography==2.8 +dropbox==9.1.0 +email-reply-parser==0.5.9 +Faker==2.0.4 +frontmatter==3.0.5 +future==0.18.2 GitPython==2.1.11 -psycopg2==2.7.5 +google-api-python-client==1.7.11 +google-auth-httplib2==0.0.3 +google-auth-oauthlib==0.4.1 +google-auth==1.7.1 +googlemaps==3.1.1 +gunicorn==19.9.0 +html2text==2016.9.19 +ipython==5.8.0 +Jinja2==2.10.3 +markdown2==2.3.6 +maxminddb-geolite2==2018.703 +ndg-httpsclient==0.5.1 +num2words==0.5.5 +oauthlib==3.1.0 +openpyxl==2.6.4 +passlib==1.7.1 +pdfkit==0.6.1 +Pillow==6.2.1 +premailer==3.6.1 psycopg2-binary==2.7.5 -sqlparse==0.2.4 +psycopg2==2.7.5 +pyasn1==0.4.7 Pygments==2.2.0 -frontmatter +PyJWT==1.7.1 +PyMySQL==0.9.3 +pyOpenSSL==19.0.0 +pyotp==2.3.0 +PyPDF2==1.26.0 +pypng==0.0.20 +PyQRCode==1.2.1 +python-dateutil==2.8.1 +pytz==2019.3 PyYAML==3.13 -xlrd -RestrictedPython==5.0 \ No newline at end of file +rauth==0.7.3 +redis>=3.0 +requests-oauthlib==1.3.0 +requests==2.22.0 +RestrictedPython==5.0 +rq>=1.1.0 +schedule==0.6.0 +semantic-version==2.8.2 +six==1.13.0 +sqlparse==0.2.4 +stripe==2.40.0 +unittest-xml-reporting==2.5.2 +urllib3==1.25.7 +watchdog==0.8.0 +Werkzeug==0.16.0 +xlrd==1.2.0 +zxcvbn-python==4.4.24 \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 0838f3f255..7a59102a1e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -255,12 +255,17 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= -ansi-styles@^3.2.1: +ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== @@ -628,10 +633,10 @@ camelcase@^3.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= -camelcase@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= +camelcase@^5.0.0: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== caniuse-api@^3.0.0: version "3.0.0" @@ -738,14 +743,14 @@ cliui@^3.2.0: strip-ansi "^3.0.1" wrap-ansi "^2.0.0" -cliui@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" - integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ== +cliui@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" + integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== dependencies: - string-width "^2.1.1" - strip-ansi "^4.0.0" - wrap-ansi "^2.0.0" + string-width "^3.1.0" + strip-ansi "^5.2.0" + wrap-ansi "^5.1.0" clone@^2.1.1, clone@^2.1.2: version "2.1.2" @@ -953,15 +958,6 @@ cross-spawn@^3.0.0: lru-cache "^4.0.1" which "^1.2.9" -cross-spawn@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -1253,7 +1249,7 @@ debug@~4.1.0: dependencies: ms "^2.1.1" -decamelize@^1.1.1, decamelize@^1.1.2: +decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -1373,6 +1369,11 @@ elegant-spinner@^1.0.1: resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= +emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== + emojis-list@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" @@ -1516,19 +1517,6 @@ execa@0.10.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c= - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - executable@4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c" @@ -1722,12 +1710,12 @@ find-up@^1.0.0: path-exists "^2.0.0" pinkie-promise "^2.0.0" -find-up@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= +find-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== dependencies: - locate-path "^2.0.0" + locate-path "^3.0.0" for-in@^1.0.2: version "1.0.2" @@ -1803,7 +1791,7 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fstream@^1.0.0, fstream@^1.0.2: +fstream@^1.0.0, fstream@^1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== @@ -1856,6 +1844,11 @@ get-caller-file@^1.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== +get-caller-file@^2.0.1: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + get-pixels@^3.2.3: version "3.3.2" resolved "https://registry.yarnpkg.com/get-pixels/-/get-pixels-3.3.2.tgz#3f62fb8811932c69f262bba07cba72b692b4ff03" @@ -1942,9 +1935,9 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@~7.1.1: path-is-absolute "^1.0.0" glob@^7.1.3: - version "7.1.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" - integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A== + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -1989,7 +1982,12 @@ globule@^1.0.0: lodash "~4.17.10" minimatch "~3.0.2" -graceful-fs@^4.1.2, graceful-fs@^4.1.6: +graceful-fs@^4.1.2: + version "4.2.3" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" + integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== + +graceful-fs@^4.1.6: version "4.1.15" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== @@ -2249,7 +2247,12 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.3, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3: +inherits@2, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +inherits@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= @@ -2766,12 +2769,12 @@ loader-utils@^0.2.16: json5 "^0.5.0" object-assign "^4.0.1" -locate-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= +locate-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== dependencies: - p-locate "^2.0.0" + p-locate "^3.0.0" path-exists "^3.0.0" lodash.camelcase@^4.3.0: @@ -2900,13 +2903,6 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -mem@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" - integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y= - dependencies: - mimic-fn "^1.0.0" - meow@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" @@ -3000,11 +2996,6 @@ mime@^1.4.1: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mimic-fn@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" - integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== - minimatch@^3.0.4, minimatch@~3.0.2: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -3347,15 +3338,6 @@ os-locale@^1.4.0: dependencies: lcid "^1.0.0" -os-locale@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" - integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA== - dependencies: - execa "^0.7.0" - lcid "^1.0.0" - mem "^1.1.0" - os-tmpdir@^1.0.0, os-tmpdir@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -3374,19 +3356,19 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= -p-limit@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" - integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== +p-limit@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537" + integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg== dependencies: - p-try "^1.0.0" + p-try "^2.0.0" -p-locate@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= +p-locate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== dependencies: - p-limit "^1.1.0" + p-limit "^2.0.0" p-map@^1.1.1: version "1.2.0" @@ -3398,10 +3380,10 @@ p-queue@^2.4.2: resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-2.4.2.tgz#03609826682b743be9a22dba25051bd46724fc34" integrity sha512-n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng== -p-try@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" - integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== parchment@quilljs/parchment#487850f7eb030a6c4e750ba809e58b09444e0bdb: version "2.0.0-dev" @@ -4283,6 +4265,11 @@ require-main-filename@^1.0.1: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== + reserved-words@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz#00a0940f98cd501aeaaac316411d9adc52b31ab1" @@ -4337,9 +4324,9 @@ rgba-regex@^1.0.0: integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= rimraf@2: - version "2.6.3" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" - integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== dependencies: glob "^7.1.3" @@ -4572,12 +4559,12 @@ shebang-regex@^1.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= -showdown@^1.8.6: - version "1.9.0" - resolved "https://registry.yarnpkg.com/showdown/-/showdown-1.9.0.tgz#d49d2a0b6db21b7c2e96ef855f7b3b2a28ef46f4" - integrity sha512-x7xDCRIaOlicbC57nMhGfKamu+ghwsdVkHMttyn+DelwzuHOx4OHCVL/UW/2QOLH7BxfCcCCVVUix3boKXJKXQ== +showdown@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/showdown/-/showdown-1.9.1.tgz#134e148e75cd4623e09c21b0511977d79b5ad0ef" + integrity sha512-9cGuS382HcvExtf5AHk7Cb4pAeQQ+h0eTr33V1mu+crYWV4KvWAw6el92bDrqGEk5d46Ai/fhbEUwqJ/mTCNEA== dependencies: - yargs "^10.0.3" + yargs "^14.2" signal-exit@^3.0.0: version "3.0.2" @@ -4825,7 +4812,7 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1: +"string-width@^1.0.2 || 2": version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -4833,6 +4820,15 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +string-width@^3.0.0, string-width@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -4854,6 +4850,13 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" +strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + strip-bom@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" @@ -4962,12 +4965,12 @@ symbol-observable@1.0.1: integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ= tar@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" - integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE= + version "2.2.2" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" + integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== dependencies: block-stream "*" - fstream "^1.0.2" + fstream "^1.0.12" inherits "2" terser@^3.14.1: @@ -5296,6 +5299,15 @@ wrap-ansi@^2.0.0: string-width "^1.0.1" strip-ansi "^3.0.1" +wrap-ansi@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" + integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== + dependencies: + ansi-styles "^3.2.0" + string-width "^3.0.0" + strip-ansi "^5.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -5318,11 +5330,24 @@ y18n@^3.2.1: resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= +y18n@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" + integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== + yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= +yargs-parser@^15.0.0: + version "15.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.0.tgz#cdd7a97490ec836195f59f3f4dbe5ea9e8f75f08" + integrity sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-parser@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" @@ -5330,30 +5355,22 @@ yargs-parser@^5.0.0: dependencies: camelcase "^3.0.0" -yargs-parser@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950" - integrity sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ== +yargs@^14.2: + version "14.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.0.tgz#f116a9242c4ed8668790b40759b4906c276e76c3" + integrity sha512-/is78VKbKs70bVZH7w4YaZea6xcJWOAwkhbR0CFuZBmYtfTYF0xjGJF43AYd8g2Uii1yJwmS5GR2vBmrc32sbg== dependencies: - camelcase "^4.1.0" - -yargs@^10.0.3: - version "10.1.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5" - integrity sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig== - dependencies: - cliui "^4.0.0" - decamelize "^1.1.1" - find-up "^2.1.0" - get-caller-file "^1.0.1" - os-locale "^2.0.0" + cliui "^5.0.0" + decamelize "^1.2.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" require-directory "^2.1.1" - require-main-filename "^1.0.1" + require-main-filename "^2.0.0" set-blocking "^2.0.0" - string-width "^2.0.0" + string-width "^3.0.0" which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^8.1.0" + y18n "^4.0.0" + yargs-parser "^15.0.0" yargs@^7.0.0: version "7.1.0"