Merge pull request #4089 from mbauskar/minor-fixes

[hotfix] minor fixes for text editor, report print and 2fa

frappe/public/js/frappe/form/controls/text_editor.js

@@ -46,7 +46,8 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 					// this function is executed only once
 					$(".note-editable[contenteditable='true']").one('focus', function() {
 						var $this = $(this);
-						$this.html($this.html() + '<br>');
+						if(!$this.html())
+							$this.html($this.html() + '<br>');
 					});
 				},
 				onChange: function(value) {

frappe/public/js/frappe/views/reports/print_grid.html

@@ -24,7 +24,7 @@
             {% for col in columns %}
                 {% if col.name && col._id !== "_check" %}
 
-					{% var value = col.fieldname ? row[col.fieldname] : row[col.id]; %}
+					{% var value = col.fieldname ? row[col.fieldname] : row[col.field]; %}
 
                 	<td>{{ col.formatter
 	                        ? col.formatter(row._index, col._index, value, col, row, true)

frappe/tests/test_twofactor.py

@@ -51,6 +51,7 @@ class TestTwoFactor(unittest.TestCase):
 		'''Should return true if enabled for user.'''
 		toggle_2fa_all_role(state=True)
 		self.assertTrue(two_factor_is_enabled_for_(self.user))
+		self.assertFalse(two_factor_is_enabled_for_("Administrator"))
 		toggle_2fa_all_role(state=False)
 		self.assertFalse(two_factor_is_enabled_for_(self.user))
 
@@ -87,7 +88,6 @@ class TestTwoFactor(unittest.TestCase):
 		_str = render_string_template(_str,args)
 		self.assertEqual(_str,'Verification Code from Frappe Technologies')
 
-
 def set_request(**kwargs):
 	builder = EnvironBuilder(**kwargs)
 	frappe.local.request = Request(builder.get_environ())

frappe/twofactor.py

@@ -74,6 +74,9 @@ def cache_2fa_data(user, token, otp_secret, tmp_id):
 
 def two_factor_is_enabled_for_(user):
 	'''Check if 2factor is enabled for user.'''
+	if user == "Administrator":
+		return False
+
 	if isinstance(user, string_types):
 		user = frappe.get_doc('User', user)