[fix] block module fix and quick entry for name
This commit is contained in:
parent
3e489d3cb6
commit
701732b687
4 changed files with 18 additions and 8 deletions
|
|
@ -162,12 +162,13 @@ def set_desktop_icons(visible_list):
|
|||
frappe.db.sql('delete from `tabDesktop Icon` where standard=0')
|
||||
|
||||
# set all as blocked
|
||||
frappe.db.sql('update `tabDesktop Icon` set blocked=1, hidden=0')
|
||||
frappe.db.sql('update `tabDesktop Icon` set blocked=0, hidden=1')
|
||||
|
||||
# set as visible if present, or add icon
|
||||
for module_name in visible_list:
|
||||
if frappe.db.get_value('Desktop Icon', {'module_name': module_name}):
|
||||
set_hidden(module_name, None, 0)
|
||||
name = frappe.db.get_value('Desktop Icon', {'module_name': module_name})
|
||||
if name:
|
||||
frappe.db.set_value('Desktop Icon', name, 'hidden', 0)
|
||||
else:
|
||||
if frappe.db.exists('DocType', module_name):
|
||||
icon_name = add_user_icon(module_name)
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@ frappe.ui.form.Layout = Class.extend({
|
|||
fieldobj.doctype = me.doc.doctype;
|
||||
fieldobj.docname = me.doc.name;
|
||||
fieldobj.df = frappe.meta.get_docfield(me.doc.doctype,
|
||||
fieldobj.df.fieldname, me.frm ? me.frm.doc.name : me.doc.name);
|
||||
fieldobj.df.fieldname, me.frm ? me.frm.doc.name : me.doc.name) || fieldobj.df;
|
||||
|
||||
// on form change, permissions can change
|
||||
if(me.frm) {
|
||||
|
|
|
|||
|
|
@ -4,10 +4,11 @@ frappe.ui.form.quick_entry = function(doctype, success) {
|
|||
frappe.model.with_doctype(doctype, function() {
|
||||
var mandatory = $.map(frappe.get_meta(doctype).fields,
|
||||
function(d) { return (d.reqd || d.bold && !d.read_only) ? d : null });
|
||||
var meta = frappe.get_meta(doctype);
|
||||
|
||||
var doc = frappe.model.get_new_doc(doctype);
|
||||
|
||||
if(frappe.get_meta(doctype).quick_entry != 1) {
|
||||
if(meta.quick_entry != 1) {
|
||||
frappe.set_route('Form', doctype, doc.name);
|
||||
return;
|
||||
}
|
||||
|
|
@ -24,6 +25,10 @@ frappe.ui.form.quick_entry = function(doctype, success) {
|
|||
return;
|
||||
}
|
||||
|
||||
if(meta.autoname.toLowerCase()==='prompt') {
|
||||
mandatory = [{fieldname:'__name', label:__('{0} Name', [meta.name]),
|
||||
reqd: 1, fieldtype:'Data'}].concat(mandatory);
|
||||
}
|
||||
|
||||
var dialog = new frappe.ui.Dialog({
|
||||
title: __("New {0}", [doctype]),
|
||||
|
|
@ -33,8 +38,12 @@ frappe.ui.form.quick_entry = function(doctype, success) {
|
|||
var update_doc = function() {
|
||||
var data = dialog.get_values(true);
|
||||
$.each(data, function(key, value) {
|
||||
if(!is_null(value)) {
|
||||
dialog.doc[key] = value;
|
||||
if(key==='__name') {
|
||||
dialog.doc.name = value;
|
||||
} else {
|
||||
if(!is_null(value)) {
|
||||
dialog.doc[key] = value;
|
||||
}
|
||||
}
|
||||
});
|
||||
return dialog.doc;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
class="form-control" placeholder="{{ _('Password') }}" required>
|
||||
|
||||
<div>
|
||||
<p style="float:left" class="text-center small"><input type="checkbox" value="remember-me"> Remember me </p>
|
||||
<!-- <p style="float:left" class="text-center small"><input type="checkbox" value="remember-me"> Remember me </p> -->
|
||||
<p style="float:right" class="text-center small"><a href="#forgot">{{ _("Forgot Password?") }}</a></p>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue