Merge branch 'develop'

frappe · Mar 10, 2016 · b660bb0 · b660bb0
2 parents 1620df2 + 461e060
commit b660bb0
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 13 deletions.
diff --git a/frappe/__version__.py b/frappe/__version__.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "6.26.1"
+__version__ = "6.26.2"
diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js
@@ -24,6 +24,10 @@ frappe.ui.form.on("Customize Form", {
 				$(grid_row.row).css({"font-weight": "bold"});
 			}
 		});
+
+		$(frm.wrapper).on("grid-make-sortable", function(e, frm) {
+			frm.trigger("setup_sortable");
+		});
 	},
 
 	doc_type: function(frm) {
@@ -33,20 +37,24 @@ frappe.ui.form.on("Customize Form", {
 				doc: frm.doc,
 				callback: function(r) {
 					frm.refresh();
-
-					// setup sortable
-					frm.page.body.find('.no-sort').removeClass('no-sort');
-					frm.doc.fields.forEach(function(f, i) {
-						if(!f.is_custom_field) {
-							frm.page.body.find('[data-fieldname="fields"] [data-idx="'+ f.idx +'"]').addClass('no-sort')
-						}
-					});
-
+					frm.trigger("setup_sortable");
 				}
 			});
 		}
 	},
 
+	setup_sortable: function(frm) {
+		frm.doc.fields.forEach(function(f, i) {
+			var data_row = frm.page.body.find('[data-fieldname="fields"] [data-idx="'+ f.idx +'"] .data-row');
+
+			if(!f.is_custom_field) {
+				data_row.removeClass('sortable-handle');
+			} else {
+				data_row.addClass("highlight");
+			}
+		});
+	},
+
 	refresh: function(frm) {
 		frm.disable_save();
 		frm.page.clear_icons();

diff --git a/frappe/hooks.py b/frappe/hooks.py
@@ -5,7 +5,7 @@
 app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
 
 app_icon = "octicon octicon-circuit-board"
-app_version = "6.26.1"
+app_version = "6.26.2"
 app_color = "orange"
 source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"

diff --git a/frappe/public/css/form_grid.css b/frappe/public/css/form_grid.css
@@ -30,6 +30,12 @@
 .form-grid .data-row {
   padding: 10px 15px;
 }
+.form-grid .data-row.highlight {
+  background-color: #fffdf4;
+}
+.form-grid .data-row.sortable-handle {
+  cursor: move;
+}
 .grid-body .data-row {
   font-size: 12px;
 }

diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
@@ -134,7 +134,6 @@ frappe.ui.form.Grid = Class.extend({
 
 		new Sortable($rows.get(0), {
 			handle: ".sortable-handle",
-			filter: '.no-sort',
 			onUpdate: function(event, ui) {
 				me.frm.doc[me.df.fieldname] = [];
 				$rows.find(".grid-row").each(function(i, item) {
@@ -146,6 +145,8 @@ frappe.ui.form.Grid = Class.extend({
 				me.frm.dirty();
 			}
 		});
+
+		$(this.frm.wrapper).trigger("grid-make-sortable", [this.frm]);
 	},
 	get_data: function() {
 		var data = this.frm.doc[this.df.fieldname] || [];

diff --git a/frappe/public/less/form_grid.less b/frappe/public/less/form_grid.less
@@ -35,6 +35,14 @@
 
 .form-grid .data-row {
 	padding: 10px 15px;
+
+	&.highlight {
+		background-color: @extra-light-yellow;
+	}
+
+	&.sortable-handle {
+		cursor: move;
+	}
 }
 
 .grid-body .data-row {

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
-version = "6.26.1"
+version = "6.26.2"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(