Merge branch 'hotfix'

frappe/__init__.py

@@ -23,7 +23,7 @@ if sys.version[0] == '2':
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '11.1.1'
+__version__ = '11.1.2'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/doctype/data_import/data_import.py

@@ -34,8 +34,10 @@ def import_data(data_import):
 	frappe.db.set_value("Data Import", data_import, "import_status", "In Progress", update_modified=False)
 	frappe.publish_realtime("data_import_progress", {"progress": "0",
 		"data_import": data_import, "reload": True}, user=frappe.session.user)
+
 	from frappe.core.page.background_jobs.background_jobs import get_info
 	enqueued_jobs = [d.get("job_name") for d in get_info()]
+
 	if data_import not in enqueued_jobs:
 		enqueue(upload, queue='default', timeout=6000, event='data_import', job_name=data_import,
 			data_import_doc=data_import, from_data_import="Yes", user=frappe.session.user)

frappe/core/doctype/data_import/importer.py

@@ -427,15 +427,28 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False,
 
 			except Exception as e:
 				error_flag = True
-				err_msg = frappe.local.message_log and "\n".join([json.loads(msg).get('message') for msg in frappe.local.message_log]) or cstr(e)
+
+				# build error message
+				if frappe.local.message_log:
+					err_msg = "\n".join(['<p class="border-bottom small">{}</p>'.format(json.loads(msg).get('message')) for msg in frappe.local.message_log])
+				else:
+					err_msg = '<p class="border-bottom small">{}</p>'.format(cstr(e))
+
 				error_trace = frappe.get_traceback()
 				if error_trace:
 					error_log_doc = frappe.log_error(error_trace)
 					error_link = get_url_to_form("Error Log", error_log_doc.name)
 				else:
 					error_link = None
-				log(**{"row": row_idx + 1, "title":'Error for row %s' % (len(row)>1 and frappe.safe_decode(row[1]) or ""), "message": err_msg,
-					"indicator": "red", "link":error_link})
+
+				log(**{
+					"row": row_idx + 1,
+					"title": 'Error for row %s' % (len(row)>1 and frappe.safe_decode(row[1]) or ""),
+					"message": err_msg,
+					"indicator": "red",
+					"link":error_link
+				})
+
 				# data with error to create a new file
 				# include the errored data in the last row as last_error_row_idx will not be updated for the last row
 				if skip_errors:

frappe/core/doctype/data_import/log_details.html

@@ -6,19 +6,19 @@
 					<th style="width:40%"> {{ __("Row Status") }} </th>
 					<th style="width:50%"> {{ __("Message") }} </th>
 				</tr>
-			
+
 			{% for row in data %}
 				{% if (!show_only_errors) || (show_only_errors && row.indicator == "red") %}
 				<tr>
 					<td>
-						<span>{{ row.row }} </span> 
+						<span>{{ row.row }} </span>
 					</td>
 					<td>
 						<span class="indicator {{ row.indicator }}"> {{ row.title }} </span>
 					</td>
 					<td>
 						{% if (import_status != "Failed" || (row.indicator == "red")) { %}
-							<span> {{ row.message }} </span>
+							<div>{{ row.message }}</div>
 							{% if row.link %}
 								<span style="width: 10%; float:right;">
 									<a class="btn-open no-decoration" title="Open Link" href="{{ row.link }}">

frappe/core/doctype/user/user.py

@@ -930,7 +930,7 @@ def handle_password_test_fail(result):
 	suggestions = result['feedback']['suggestions'][0] if result['feedback']['suggestions'] else ''
 	warning = result['feedback']['warning'] if 'warning' in result['feedback'] else ''
 	suggestions += "<br>" + _("Hint: Include symbols, numbers and capital letters in the password") + '<br>'
-	frappe.throw(_('Invalid Password: ' + ' '.join([warning, suggestions])))
+	frappe.throw(' '.join([_('Invalid Password:'), warning, suggestions]))
 
 def update_gravatar(name):
 	gravatar = has_gravatar(name)

frappe/printing/page/print_format_builder/print_format_builder_section.html

@@ -1,4 +1,4 @@
-<div class="print-format-builder-section row light-bg" data-label="{{ section.label || '' }}">
+<div class="print-format-builder-section row light-bg" data-label="{{ section.label }}">
     <div class="print-format-builder-section-head">
         <a class="section-settings pull-right
             btn-default btn-xs" style="padding-top: 3px">

frappe/templates/includes/search_box.html

@@ -15,7 +15,7 @@
 <script>
 frappe.ready(function() {
 	if(frappe.utils.get_url_arg("search")) {
-		$(".item-search-results").html('{{ _("Search results for") + ": " + html2text(frappe.form_dict.search or "")|trim }}');
+		$(".item-search-results").html('{{ _("Search results for") + ": " + html2text(frappe.form_dict.search or "") | e | trim }}');
 		$(".item-search").toggle(false);
 		$(".clear").toggle(true);
 	}

frappe/templates/includes/search_template.html

@@ -23,8 +23,8 @@
 	<form action='{{ route }}'>
 	<input name='q' class='form-control' type='text'
 		style='max-width: 400px; display: inline-block; margin-right: 10px;'
-		value='{{ frappe.form_dict.q or ''}}'
-		{% if not frappe.form_dict.q%}placeholder="{{ _("Search...") }}"{% endif %}>
+		value='{{ query or ''}}'
+		{% if not query %}placeholder="{{ _("Search...") }}"{% endif %}>
 	<input type='submit'
 		class='btn btn-sm btn-primary btn-search' value="{{ _("Search") }}">
 	</form>
@@ -41,7 +41,7 @@
 		{% endfor %}
 	</div>
 
-{% elif frappe.form_dict.q %}
+{% elif query %}
 	<p class='text-muted'>{{ _("No matching records. Search something new") }}
 {% else %}
 	<p class='text-muted'>{{ _("Type something in the search box to search") }}

frappe/www/search.html

@@ -10,7 +10,7 @@ frappe.ready(function() {
 		frappe.call({
 			method: 'frappe.www.search.get_search_results',
 			args: {
-				text: '{{ frappe.form_dict.q }}',
+				text: '{{ query }}',
 				start: $('.search-result-item').length,
 				as_html: 1
 			},