diff --git a/builder/admin.sqlite b/builder/admin.sqlite index db0628a..c15fc25 100644 Binary files a/builder/admin.sqlite and b/builder/admin.sqlite differ diff --git a/builder/builder.sqlite b/builder/builder.sqlite index 13020fa..1429752 100644 Binary files a/builder/builder.sqlite and b/builder/builder.sqlite differ diff --git a/builder/js/app_builder.js b/builder/js/app_builder.js index 9a6f0c3..7e2bf99 100644 --- 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 + ' ' + item.f_field_name.value + ''); + item.edit_form.find('h4.modal-title') + .html(caption + ' ' + item.f_field_name.value + '' + 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 index 3ede76a..7de3c2f 100644 --- 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 index 9731b1f..877afa9 100644 --- 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 + ' ' + item.f_field_name.value + ''); + item.edit_form.find('h4.modal-title') + .html(caption + ' ' + item.f_field_name.value + '' + 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 index d294d2e..91c7465 100644 --- a/jam/js/admin.min.js +++ b/jam/js/admin.min.js @@ -230,7 +230,7 @@ else if(field.field_name==='f_primary_key'){if(!field.value&&!item.f_virtual_tab else if(field.field_name==='f_master_id'&&!item.task._manual_update&&item.is_new()){if(!field.value&&!item.f_virtual_table.value&&item.type_id.value===types.TABLE_TYPE){return item.task.language.value_required;}} else if(field.field_name==='f_master_rec_id'){if(!field.value&&!item.f_virtual_table.value&&item.type_id.value===types.TABLE_TYPE){return item.task.language.value_required;}}} function on_field_changed(field,lookup_item){var copy,ident,names,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){names=item.task.server('get_new_table_name',field.value);item.f_table_name.value=names[0];if(item.task.db_options.NEED_GENERATOR){item.f_gen_name.value=names[1];}} +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&&!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){item.f_gen_name.value=names[1];}} if(field.field_name==='f_name'&&!item.f_item_name.value){try{ident=field.text.split(' ').join('_');ident=ident.toLowerCase();if(valid_identifier(ident)){item.f_item_name.value=ident;}} catch(e){}}} if(field.field_name==='f_deleted_flag'){if(field.value){item.f_soft_delete.read_only=false;item.f_soft_delete.value=true;} @@ -712,8 +712,8 @@ else if(item.f_data_type.value===item.task.consts.FILE){item.edit_form.find("#in else if(item.f_data_type.value===item.task.consts.IMAGE){item.edit_form.find("#interface").hide();item.edit_form.find("#text-interface").hide();item.edit_form.find("#image-interface").show();item.edit_form.find("#file-interface").hide();if(item.is_changing()){if(!item.f_image_view_width.value&&!item.f_image_view_height.value){item.f_image_view_width.value=100;} if(!item.f_image_edit_width.value&&!item.f_image_edit_height.value){item.f_image_edit_width.value=200;}}} else{item.edit_form.find("#interface").show();item.edit_form.find("#text-interface").hide();item.edit_form.find("#image-interface").hide();item.edit_form.find("#file-interface").hide();}} -function on_edit_form_shown(item){var caption='Field Editor';if(item.f_field_name.value){item.edit_form.find('h4.modal-title').html(caption+' '+item.f_field_name.value+'');} -else{item.edit_form.find('h4.modal-title').html(caption);}} +function on_edit_form_shown(item){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+' '+item.f_field_name.value+''+link);} +else{item.edit_form.find('h4.modal-title').html(caption+link);}} function on_after_open(item){item._old_fields={} item.disable_controls();try{item.each(function(i){item._old_fields[i.id.value+'']=true;})}finally{item.first() item.enable_controls();}}