`).addClass(`slide-container`)
.appendTo(this.container);
- this.$footer = $(`
`).addClass(`footer`)
+ this.$footer = $(`
`).addClass(`slide-footer`)
.appendTo(this.container);
this.render_progress_dots();
diff --git a/frappe/public/js/frappe/views/calendar/calendar.js b/frappe/public/js/frappe/views/calendar/calendar.js
index 31ea1379fb..8a42b4b828 100644
--- a/frappe/public/js/frappe/views/calendar/calendar.js
+++ b/frappe/public/js/frappe/views/calendar/calendar.js
@@ -25,10 +25,12 @@ frappe.views.CalendarView = class CalendarView extends frappe.views.ListView {
}
setup_defaults() {
- super.setup_defaults();
- this.page_title = __('{0} Calendar', [this.page_title]);
- this.calendar_settings = frappe.views.calendar[this.doctype] || {};
- this.calendar_name = frappe.get_route()[3];
+ return super.setup_defaults()
+ .then(() => {
+ this.page_title = __('{0} Calendar', [this.page_title]);
+ this.calendar_settings = frappe.views.calendar[this.doctype] || {};
+ this.calendar_name = frappe.get_route()[3];
+ });
}
setup_view() {
diff --git a/frappe/public/js/frappe/views/file/file_view.js b/frappe/public/js/frappe/views/file/file_view.js
index 79e360b83e..4a37fae166 100644
--- a/frappe/public/js/frappe/views/file/file_view.js
+++ b/frappe/public/js/frappe/views/file/file_view.js
@@ -40,15 +40,17 @@ frappe.views.FileView = class FileView extends frappe.views.ListView {
}
setup_defaults() {
- super.setup_defaults();
- this.page_title = __('File Manager');
+ return super.setup_defaults()
+ .then(() => {
+ this.page_title = __('File Manager');
- const route = frappe.get_route();
- this.current_folder = route.slice(2).join('/');
- this.filters = [['File', 'folder', '=', this.current_folder, true]];
- this.order_by = this.view_user_settings.order_by || 'file_name asc';
+ const route = frappe.get_route();
+ this.current_folder = route.slice(2).join('/');
+ this.filters = [['File', 'folder', '=', this.current_folder, true]];
+ this.order_by = this.view_user_settings.order_by || 'file_name asc';
- this.menu_items = this.menu_items.concat(this.file_menu_items());
+ this.menu_items = this.menu_items.concat(this.file_menu_items());
+ });
}
file_menu_items() {
diff --git a/frappe/public/js/frappe/views/gantt/gantt_view.js b/frappe/public/js/frappe/views/gantt/gantt_view.js
index 11cc9683e7..df01c203bb 100644
--- a/frappe/public/js/frappe/views/gantt/gantt_view.js
+++ b/frappe/public/js/frappe/views/gantt/gantt_view.js
@@ -6,16 +6,18 @@ frappe.views.GanttView = class GanttView extends frappe.views.ListView {
}
setup_defaults() {
- super.setup_defaults();
- this.page_title = this.page_title + ' ' + __('Gantt');
- this.calendar_settings = frappe.views.calendar[this.doctype] || {};
- if(this.calendar_settings.order_by) {
- this.sort_by = this.calendar_settings.order_by;
- this.sort_order = 'asc';
- } else {
- this.sort_by = this.view_user_settings.sort_by || this.calendar_settings.field_map.start;
- this.sort_order = this.view_user_settings.sort_order || 'asc';
- }
+ return super.setup_defaults()
+ .then(() => {
+ this.page_title = this.page_title + ' ' + __('Gantt');
+ this.calendar_settings = frappe.views.calendar[this.doctype] || {};
+ if(this.calendar_settings.order_by) {
+ this.sort_by = this.calendar_settings.order_by;
+ this.sort_order = 'asc';
+ } else {
+ this.sort_by = this.view_user_settings.sort_by || this.calendar_settings.field_map.start;
+ this.sort_order = this.view_user_settings.sort_order || 'asc';
+ }
+ })
}
setup_view() {
diff --git a/frappe/public/js/frappe/views/image/image_view.js b/frappe/public/js/frappe/views/image/image_view.js
index 8d2b4f7599..3c2b5e7ce1 100644
--- a/frappe/public/js/frappe/views/image/image_view.js
+++ b/frappe/public/js/frappe/views/image/image_view.js
@@ -9,8 +9,10 @@ frappe.views.ImageView = class ImageView extends frappe.views.ListView {
}
setup_defaults() {
- super.setup_defaults();
- this.page_title = this.page_title + ' ' + __('Images');
+ return super.setup_defaults()
+ .then(() => {
+ this.page_title = this.page_title + ' ' + __('Images');
+ })
}
setup_view() {
diff --git a/frappe/public/js/frappe/views/kanban/kanban_view.js b/frappe/public/js/frappe/views/kanban/kanban_view.js
index 30680fedcb..6177ac688a 100644
--- a/frappe/public/js/frappe/views/kanban/kanban_view.js
+++ b/frappe/public/js/frappe/views/kanban/kanban_view.js
@@ -27,19 +27,21 @@ frappe.views.KanbanView = class KanbanView extends frappe.views.ListView {
}
setup_defaults() {
- super.setup_defaults();
- this.board_name = frappe.get_route()[3];
- this.page_title = this.board_name;
- this.card_meta = this.get_card_meta();
+ return super.setup_defaults()
+ .then(() => {
+ this.board_name = frappe.get_route()[3];
+ this.page_title = this.board_name;
+ this.card_meta = this.get_card_meta();
- this.menu_items.push({
- label: __('Save filters'),
- action: () => {
- this.save_kanban_board_filters();
- }
- });
+ this.menu_items.push({
+ label: __('Save filters'),
+ action: () => {
+ this.save_kanban_board_filters();
+ }
+ });
- return this.get_board();
+ return this.get_board();
+ });
}
get_board() {
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index d3ca74bd25..c4f4443146 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -493,10 +493,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
const type = chart_type.toLowerCase();
const colors = color ? [color] : undefined;
- let labels = get_column_values(x_field)
- .filter(Boolean)
- .map(d => d.trim())
- .filter(Boolean);
+ let labels = get_column_values(x_field);
let dataset_values = get_column_values(y_field).map(d => Number(d));
diff --git a/frappe/public/less/controls.less b/frappe/public/less/controls.less
index a5c91d4fdc..77274e93b0 100644
--- a/frappe/public/less/controls.less
+++ b/frappe/public/less/controls.less
@@ -77,3 +77,15 @@
margin-right: 5px;
margin-bottom: 5px;
}
+
+.rating {
+ i {
+ color: @text-extra-muted;
+ }
+ .star-hover {
+ color: @text-muted;
+ }
+ .star-click {
+ color: @text-light;
+ }
+}
\ No newline at end of file
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 0290ca7e45..0c9e9c43ae 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -956,8 +956,8 @@ input[type="checkbox"] {
.btn-primary {
font-weight: bold;
}
- .footer {
- margin: 15px 0;
+ .slide-footer {
+ margin: 15px 0px;
padding: 0px 7px;
.btn:not(:last-child) {
diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index 8a42bc26dd..72b646fb64 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -66,6 +66,10 @@ img {
text-decoration: underline;
}
+.text-extra-muted {
+ color: #d1d8dd !important;
+}
+
.web-footer {
padding: 5rem 0;
min-height: 140px;
@@ -86,4 +90,4 @@ img {
.indicator {
font-size: inherit;
-}
+}
\ No newline at end of file
diff --git a/frappe/test_runner.py b/frappe/test_runner.py
index a27c5539b6..cde743643f 100644
--- a/frappe/test_runner.py
+++ b/frappe/test_runner.py
@@ -17,6 +17,7 @@ from six.moves import reload_module
from frappe.model.naming import revert_series_if_last
unittest_runner = unittest.TextTestRunner
+SLOW_TEST_THRESHOLD = 2
def xmlrunner_wrapper(output):
"""Convenience wrapper to keep method signature unchanged for XMLTestRunner and TextTestRunner"""
@@ -100,7 +101,8 @@ class TimeLoggingTestResult(unittest.TextTestResult):
def addSuccess(self, test):
elapsed = time.time() - self._started_at
name = self.getDescription(test)
- self.stream.write("\n{} ({:.03}s)\n".format(name, elapsed))
+ if elapsed >= SLOW_TEST_THRESHOLD:
+ self.stream.write("\n{} ({:.03}s)\n".format(name, elapsed))
super(TimeLoggingTestResult, self).addSuccess(test)
diff --git a/frappe/tests/test_assign.py b/frappe/tests/test_assign.py
index ed47f07dda..247489b0f9 100644
--- a/frappe/tests/test_assign.py
+++ b/frappe/tests/test_assign.py
@@ -4,6 +4,8 @@ from __future__ import unicode_literals
import frappe, unittest
import frappe.desk.form.assign_to
+from frappe.desk.listview import get_user_assignments_and_count
+from frappe.automation.doctype.assignment_rule.test_assignment_rule import make_note
class TestAssign(unittest.TestCase):
def test_assign(self):
@@ -11,12 +13,7 @@ class TestAssign(unittest.TestCase):
if not frappe.db.exists("User", "test@example.com"):
frappe.get_doc({"doctype":"User", "email":"test@example.com", "first_name":"Test"}).insert()
- added = frappe.desk.form.assign_to.add({
- "assign_to": "test@example.com",
- "doctype": todo.doctype,
- "name": todo.name,
- "description": todo.description,
- })
+ added = assign(todo, "test@example.com")
self.assertTrue("test@example.com" in [d.owner for d in added])
@@ -25,3 +22,46 @@ class TestAssign(unittest.TestCase):
# assignment is cleared
assignments = frappe.desk.form.assign_to.get(dict(doctype = todo.doctype, name=todo.name))
self.assertEqual(len(assignments), 0)
+
+ def test_assignment_count(self):
+ frappe.db.sql('delete from tabToDo')
+
+ if not frappe.db.exists("User", "test_assign1@example.com"):
+ frappe.get_doc({"doctype":"User", "email":"test_assign1@example.com", "first_name":"Test", "roles": [{"role": "System Manager"}]}).insert()
+
+ if not frappe.db.exists("User", "test_assign2@example.com"):
+ frappe.get_doc({"doctype":"User", "email":"test_assign2@example.com", "first_name":"Test", "roles": [{"role": "System Manager"}]}).insert()
+
+ note = make_note()
+ assign(note, "test_assign1@example.com")
+
+ note = make_note(dict(public=1))
+ assign(note, "test_assign2@example.com")
+
+ note = make_note(dict(public=1))
+ assign(note, "test_assign2@example.com")
+
+ note = make_note()
+ assign(note, "test_assign2@example.com")
+
+ data = {d.name: d.count for d in get_user_assignments_and_count('Note', [])}
+
+ self.assertTrue('test_assign1@example.com' in data)
+ self.assertEqual(data['test_assign1@example.com'], 1)
+ self.assertEqual(data['test_assign2@example.com'], 3)
+
+ data = {d.name: d.count for d in get_user_assignments_and_count('Note', [{'public': 1}])}
+
+ self.assertFalse('test_assign1@example.com' in data)
+ self.assertEqual(data['test_assign2@example.com'], 2)
+
+ frappe.db.rollback()
+
+
+def assign(doc, user):
+ return frappe.desk.form.assign_to.add({
+ "assign_to": user,
+ "doctype": doc.doctype,
+ "name": doc.name,
+ "description": 'test',
+ })
diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py
index 4c48ef2811..44d87746da 100644
--- a/frappe/tests/test_document.py
+++ b/frappe/tests/test_document.py
@@ -5,6 +5,7 @@ from __future__ import unicode_literals
import frappe, unittest, os
from frappe.utils import cint
from frappe.model.naming import revert_series_if_last, make_autoname, parse_naming_series
+from frappe.utils.testutils import add_custom_field, clear_custom_fields
class TestDocument(unittest.TestCase):
def test_get_return_empty_list_for_table_field_if_none(self):
@@ -236,3 +237,20 @@ class TestDocument(unittest.TestCase):
new_current = cint(frappe.db.get_value('Series', prefix, "current", order_by="name"))
self.assertEqual(cint(old_current) - 1, new_current)
+
+ def test_default_of_dependent_field(self):
+ add_custom_field('ToDo', 'parent_field', 'Data')
+
+ add_custom_field('ToDo', 'dependent_field', 'Data',
+ default='Some Data', depends_on='parent_field')
+
+ add_custom_field('ToDo', 'independent_field', 'Data',
+ default='Some Data')
+
+
+ doc = frappe.new_doc('ToDo')
+
+ self.assertFalse(doc.get('dependent_field'))
+ self.assertEqual(doc.get('independent_field'), 'Some Data')
+
+ clear_custom_fields('ToDo')
\ No newline at end of file
diff --git a/frappe/tests/test_naming.py b/frappe/tests/test_naming.py
index 1b1f0ac98c..90ab6a6a94 100644
--- a/frappe/tests/test_naming.py
+++ b/frappe/tests/test_naming.py
@@ -51,7 +51,7 @@ class TestNaming(unittest.TestCase):
todo.description = description
todo.insert()
- series = getseries('', 2, doctype)
+ series = getseries('', 2)
series = str(int(series)-1)
@@ -93,4 +93,4 @@ class TestNaming(unittest.TestCase):
count = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0]
self.assertEqual(count.get('current'), 2)
- frappe.db.sql("""delete from `tabSeries` where name = %s""", series)
\ No newline at end of file
+ frappe.db.sql("""delete from `tabSeries` where name = %s""", series)
diff --git a/frappe/utils/testutils.py b/frappe/utils/testutils.py
index 4af3ad647c..e47cf3d90f 100644
--- a/frappe/utils/testutils.py
+++ b/frappe/utils/testutils.py
@@ -4,13 +4,15 @@ from __future__ import unicode_literals
import frappe
-def add_custom_field(doctype, fieldname, fieldtype='Data', options=None):
+def add_custom_field(doctype, fieldname, fieldtype='Data', options=None, default=None, depends_on=None):
frappe.get_doc({
"doctype": "Custom Field",
"dt": doctype,
"fieldname": fieldname,
"fieldtype": fieldtype,
- "options": options
+ "options": options,
+ "default": default,
+ "depends_on": depends_on
}).insert()
def clear_custom_fields(doctype):
diff --git a/frappe/website/doctype/web_form_field/web_form_field.json b/frappe/website/doctype/web_form_field/web_form_field.json
index 31d36c5625..8b6eb5744d 100644
--- a/frappe/website/doctype/web_form_field/web_form_field.json
+++ b/frappe/website/doctype/web_form_field/web_form_field.json
@@ -19,6 +19,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fetch_if_empty": 0,
"fieldname": "fieldname",
"fieldtype": "Select",
"hidden": 0,
@@ -50,6 +51,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fetch_if_empty": 0,
"fieldname": "fieldtype",
"fieldtype": "Select",
"hidden": 0,
@@ -62,7 +64,7 @@
"label": "Fieldtype",
"length": 0,
"no_copy": 0,
- "options": "Attach\nAttach Image\nCheck\nCurrency\nData\nDate\nDatetime\nFloat\nHTML\nInt\nLink\nSelect\nSmall Text\nText\nText Editor\nTable\nSection Break\nColumn Break\nPage Break",
+ "options": "Attach\nAttach Image\nCheck\nCurrency\nData\nDate\nDatetime\nFloat\nHTML\nInt\nLink\nRating\nSelect\nSmall Text\nText\nText Editor\nTable\nSection Break\nColumn Break\nPage Break",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -82,6 +84,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fetch_if_empty": 0,
"fieldname": "label",
"fieldtype": "Data",
"hidden": 0,
@@ -114,6 +117,7 @@
"collapsible": 0,
"columns": 0,
"depends_on": "eval:doc.fieldtype === 'Link'",
+ "fetch_if_empty": 0,
"fieldname": "allow_read_on_all_link_options",
"fieldtype": "Check",
"hidden": 0,
@@ -146,6 +150,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fetch_if_empty": 0,
"fieldname": "reqd",
"fieldtype": "Check",
"hidden": 0,
@@ -177,6 +182,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fetch_if_empty": 0,
"fieldname": "depends_on",
"fieldtype": "Code",
"hidden": 0,
@@ -209,6 +215,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fetch_if_empty": 0,
"fieldname": "read_only",
"fieldtype": "Check",
"hidden": 0,
@@ -240,6 +247,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fetch_if_empty": 0,
"fieldname": "show_in_filter",
"fieldtype": "Check",
"hidden": 0,
@@ -272,6 +280,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fetch_if_empty": 0,
"fieldname": "hidden",
"fieldtype": "Check",
"hidden": 0,
@@ -303,6 +312,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fetch_if_empty": 0,
"fieldname": "column_break_4",
"fieldtype": "Column Break",
"hidden": 0,
@@ -333,6 +343,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fetch_if_empty": 0,
"fieldname": "options",
"fieldtype": "Text",
"hidden": 0,
@@ -364,6 +375,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fetch_if_empty": 0,
"fieldname": "max_length",
"fieldtype": "Int",
"hidden": 0,
@@ -397,6 +409,7 @@
"collapsible": 0,
"columns": 0,
"depends_on": "eval:doc.fieldtype=='Int'",
+ "fetch_if_empty": 0,
"fieldname": "max_value",
"fieldtype": "Int",
"hidden": 0,
@@ -429,6 +442,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fetch_if_empty": 0,
"fieldname": "section_break_6",
"fieldtype": "Section Break",
"hidden": 0,
@@ -459,6 +473,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fetch_if_empty": 0,
"fieldname": "description",
"fieldtype": "Text",
"hidden": 0,
@@ -490,6 +505,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fetch_if_empty": 0,
"fieldname": "column_break_8",
"fieldtype": "Column Break",
"hidden": 0,
@@ -520,6 +536,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fetch_if_empty": 0,
"fieldname": "default",
"fieldtype": "Data",
"hidden": 0,
@@ -555,7 +572,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2019-01-31 15:06:55.367043",
+ "modified": "2019-03-12 17:00:50.034229",
"modified_by": "Administrator",
"module": "Website",
"name": "Web Form Field",