in App builder help badge added to Field Editor Dialog

when manual mode is set in App builder changing item name won't change item table name
jam-py · Mar 17, 2022 · 7ac9528 · 7ac9528
1 parent 81f89a6
commit 7ac9528
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/builder/admin.sqlite b/builder/admin.sqlite
diff --git a/builder/builder.sqlite b/builder/builder.sqlite
diff --git a/builder/js/app_builder.js b/builder/js/app_builder.js
@@ -1694,7 +1694,7 @@ function Events3() { // sys_items
 			item = field.owner
 		if (item.is_new() && item.type_id.value != item.task.item_types.DETAIL_TYPE) {
 			if (field.field_name == 'f_item_name' && !item.f_virtual_table.value &&
-				item.type_id.value !== item.task.item_types.ITEMS_TYPE) {
+				!task._manual_update && item.type_id.value !== item.task.item_types.ITEMS_TYPE) {
 				names = item.task.server('get_new_table_name', field.value);
 				item.f_table_name.value = names[0];
 				if (item.task.db_options.NEED_GENERATOR) {
@@ -5338,13 +5338,14 @@ function Events26() { // app_builder.catalogs.sys_items.sys_fields
 	}
 
 	function on_edit_form_shown(item) {
-		var caption = 'Field Editor';
-
+		let caption = 'Field Editor',
+			link = task.help_badge('http://jam-py.com/docs/admin/items/field_editor_dialog.html');
 		if (item.f_field_name.value) {
-			item.edit_form.find('h4.modal-title').html(caption + ' <span class="editor-title">' + item.f_field_name.value + '</span>');
+			item.edit_form.find('h4.modal-title')
+				.html(caption + ' <span class="editor-title">' + item.f_field_name.value + '</span>' + link);
 		}
 		else {
-			item.edit_form.find('h4.modal-title').html(caption);
+			item.edit_form.find('h4.modal-title').html(caption + link);
 		}
 	}
 

diff --git a/jam/__init__.py b/jam/__init__.py
@@ -1,4 +1,4 @@
-__version__ = (5, 4, 117)
+__version__ = (5, 4, 118)
 
 def version():
     return '%s.%s.%s' % __version__

diff --git a/jam/js/admin.js b/jam/js/admin.js
@@ -1694,7 +1694,7 @@ function Events3() { // sys_items
 			item = field.owner
 		if (item.is_new() && item.type_id.value != item.task.item_types.DETAIL_TYPE) {
 			if (field.field_name == 'f_item_name' && !item.f_virtual_table.value &&
-				item.type_id.value !== item.task.item_types.ITEMS_TYPE) {
+				!task._manual_update && item.type_id.value !== item.task.item_types.ITEMS_TYPE) {
 				names = item.task.server('get_new_table_name', field.value);
 				item.f_table_name.value = names[0];
 				if (item.task.db_options.NEED_GENERATOR) {
@@ -5338,13 +5338,14 @@ function Events26() { // app_builder.catalogs.sys_items.sys_fields
 	}
 
 	function on_edit_form_shown(item) {
-		var caption = 'Field Editor';
-
+		let caption = 'Field Editor',
+			link = task.help_badge('http://jam-py.com/docs/admin/items/field_editor_dialog.html');
 		if (item.f_field_name.value) {
-			item.edit_form.find('h4.modal-title').html(caption + ' <span class="editor-title">' + item.f_field_name.value + '</span>');
+			item.edit_form.find('h4.modal-title')
+				.html(caption + ' <span class="editor-title">' + item.f_field_name.value + '</span>' + link);
 		}
 		else {
-			item.edit_form.find('h4.modal-title').html(caption);
+			item.edit_form.find('h4.modal-title').html(caption + link);
 		}
 	}
 

diff --git a/jam/js/admin.min.js b/jam/js/admin.min.js