vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1540 from nabinhait/fix78

Browse source 
Fixes
This commit is contained in:
Nabin Hait 2016-01-22 15:25:54 +05:30
commit 079e203be2
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
frappe/core/doctype/doctype/doctype.py
View file

@ -37,6 +37,15 @@ class DocType(Document):
for c in [".", "/", "#", "&", "=", ":", "'", '"']:
if c in self.name:
frappe.throw(_("{0} not allowed in name").format(c))
if self.issingle:
self.allow_import = 0
self.is_submittable = 0
self.istable = 0
elif self.istable:
self.allow_import = 0
self.validate_series()
self.scrub_field_names()
self.validate_document_type()
@ -50,9 +59,6 @@ class DocType(Document):
self.make_amendable()
if self.istable:
self.allow_import = 0
def check_developer_mode(self):
"""Throw exception if not developer mode or via patch"""
if frappe.flags.in_patch:
@ -298,6 +304,10 @@ def validate_fields(meta):
frappe.throw(_("Precision should be between 1 and 6"))
def check_unique_and_text(d):
if meta.issingle:
d.unique = 0
d.search_index = 0
if getattr(d, "unique", False):
if d.fieldtype not in ("Data", "Link", "Read Only"):
frappe.throw(_("Fieldtype {0} for {1} cannot be unique").format(d.fieldtype, d.label))

9
frappe/public/js/frappe/form/control.js
View file

@ -672,7 +672,14 @@ frappe.ui.form.ControlCheck = frappe.ui.form.ControlData.extend({
set_input: function(value) {
this.input.checked = value ? 1 : 0;
this.last_value = value;
}
},
get_value: function() {
if (!this.$input) {
return;
}
return this.$input.prop("checked") ? 1 : 0;
},
});
frappe.ui.form.ControlButton = frappe.ui.form.ControlData.extend({