@@ -27,7 +27,7 @@ def get_value(doctype, fieldname, filters=None, as_dict=True, debug=False): | |||||
@frappe.whitelist() | @frappe.whitelist() | ||||
def set_value(doctype, name, fieldname, value): | def set_value(doctype, name, fieldname, value): | ||||
if fieldname in frappe.model.default_fields: | |||||
if fieldname!="idx" and fieldname in frappe.model.default_fields: | |||||
frappe.throw(_("Cannot edit standard fields")) | frappe.throw(_("Cannot edit standard fields")) | ||||
doc = frappe.db.get_value(doctype, name, ["parenttype", "parent"], as_dict=True) | doc = frappe.db.get_value(doctype, name, ["parenttype", "parent"], as_dict=True) | ||||
@@ -123,7 +123,7 @@ $.extend(frappe.model, { | |||||
}, | }, | ||||
copy_doc: function(dt, dn, from_amend) { | copy_doc: function(dt, dn, from_amend) { | ||||
var no_copy_list = ['name','amended_from','amendment_date','cancel_reason']; | |||||
var no_copy_list = ['name','amended_from','amendment_date','cancel_reason','idx']; | |||||
var newdoc = frappe.model.get_new_doc(dt); | var newdoc = frappe.model.get_new_doc(dt); | ||||
for(var key in locals[dt][dn]) { | for(var key in locals[dt][dn]) { | ||||
@@ -313,7 +313,8 @@ frappe.views.ReportView = frappe.ui.Listing.extend({ | |||||
}, | }, | ||||
edit_cell: function(row, docfield) { | edit_cell: function(row, docfield) { | ||||
if(frappe.model.std_fields_list.indexOf(docfield.fieldname)!==-1) { | |||||
if(docfield.fieldname !== "idx" && | |||||
frappe.model.std_fields_list.indexOf(docfield.fieldname)!==-1) { | |||||
frappe.throw(frappe._("Cannot edit standard fields")); | frappe.throw(frappe._("Cannot edit standard fields")); | ||||
} else if(frappe.boot.profile.can_write.indexOf(this.doctype)===-1) { | } else if(frappe.boot.profile.can_write.indexOf(this.doctype)===-1) { | ||||
frappe.throw(frappe._("No permission to edit")); | frappe.throw(frappe._("No permission to edit")); | ||||
@@ -580,6 +580,7 @@ _f.Frm.prototype.copy_doc = function(onload, from_amend) { | |||||
var dn = this.docname; | var dn = this.docname; | ||||
// copy parent | // copy parent | ||||
var newdoc = frappe.model.copy_doc(this.doctype, dn, from_amend); | var newdoc = frappe.model.copy_doc(this.doctype, dn, from_amend); | ||||
newdoc.idx = null; | |||||
// copy chidren | // copy chidren | ||||
var dl = make_doclist(this.doctype, dn); | var dl = make_doclist(this.doctype, dn); | ||||
@@ -10,9 +10,6 @@ from frappe.model.doc import make_autoname | |||||
class DocType(WebsiteGenerator): | class DocType(WebsiteGenerator): | ||||
def __init__(self, d, dl): | def __init__(self, d, dl): | ||||
self.doc, self.doclist = d, dl | self.doc, self.doclist = d, dl | ||||
def autoname(self): | |||||
self.doc.name = make_autoname("Website-Group-.######") | |||||
def get_page_title(self): | def get_page_title(self): | ||||
return self.doc.group_title | return self.doc.group_title | ||||
@@ -2,7 +2,7 @@ | |||||
{ | { | ||||
"creation": "2014-01-29 15:57:42", | "creation": "2014-01-29 15:57:42", | ||||
"docstatus": 0, | "docstatus": 0, | ||||
"modified": "2014-02-10 14:38:13", | |||||
"modified": "2014-02-27 12:51:53", | |||||
"modified_by": "Administrator", | "modified_by": "Administrator", | ||||
"owner": "Administrator" | "owner": "Administrator" | ||||
}, | }, | ||||
@@ -21,6 +21,7 @@ | |||||
"permlevel": 0 | "permlevel": 0 | ||||
}, | }, | ||||
{ | { | ||||
"cancel": 0, | |||||
"create": 1, | "create": 1, | ||||
"delete": 1, | "delete": 1, | ||||
"doctype": "DocPerm", | "doctype": "DocPerm", | ||||
@@ -55,11 +55,11 @@ class DocType(DocTypeNestedSet): | |||||
def set_idx(self): | def set_idx(self): | ||||
if self.doc.parent_website_route: | if self.doc.parent_website_route: | ||||
if self.doc.idx == None: | |||||
if not self.doc.idx == None: | |||||
self.set_idx_as_last() | self.set_idx_as_last() | ||||
else: | else: | ||||
self.validate_previous_idx_exists() | self.validate_previous_idx_exists() | ||||
def set_idx_as_last(self): | def set_idx_as_last(self): | ||||
# new, append | # new, append | ||||
self.doc.idx = int(frappe.db.sql("""select ifnull(max(ifnull(idx, -1)), -1) | self.doc.idx = int(frappe.db.sql("""select ifnull(max(ifnull(idx, -1)), -1) | ||||
@@ -41,7 +41,7 @@ class sync(object): | |||||
self.get_index_txt(basepath, files) | self.get_index_txt(basepath, files) | ||||
self.sync_index_page(basepath, files) | self.sync_index_page(basepath, files) | ||||
if not frappe.db.exists("Website Route", folder_route): | |||||
if not frappe.db.exists("Website Route", folder_route) and basepath!=self.statics_path: | |||||
# not synced either by generator or by index.html | # not synced either by generator or by index.html | ||||
return | return | ||||
@@ -14,6 +14,7 @@ def call_website_generator(bean, method, *args, **kwargs): | |||||
class WebsiteGenerator(DocListController): | class WebsiteGenerator(DocListController): | ||||
def autoname(self): | def autoname(self): | ||||
self.doc.name = cleanup_page_name(self.get_page_title()) | self.doc.name = cleanup_page_name(self.get_page_title()) | ||||
self.doc.append_number_if_name_exists() | |||||
def set_page_name(self): | def set_page_name(self): | ||||
"""set page name based on parent page_name and title""" | """set page name based on parent page_name and title""" | ||||