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

fixes

Browse source
This commit is contained in:
Rushabh Mehta 2014-02-27 13:23:33 +05:30
parent c5c94242bb
commit 226087c460
9 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/client.py
View file

@ -27,7 +27,7 @@ def get_value(doctype, fieldname, filters=None, as_dict=True, debug=False):
@frappe.whitelist()
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"))
doc = frappe.db.get_value(doctype, name, ["parenttype", "parent"], as_dict=True)

2
frappe/public/js/frappe/model/create_new.js
View file

@ -123,7 +123,7 @@ $.extend(frappe.model, {
},
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);
for(var key in locals[dt][dn]) {

3
frappe/public/js/frappe/views/reportview.js
View file

@ -313,7 +313,8 @@ frappe.views.ReportView = frappe.ui.Listing.extend({
},
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"));
} else if(frappe.boot.profile.can_write.indexOf(this.doctype)===-1) {
frappe.throw(frappe._("No permission to edit"));

1
frappe/public/js/legacy/form.js
View file

@ -580,6 +580,7 @@ _f.Frm.prototype.copy_doc = function(onload, from_amend) {
var dn = this.docname;
// copy parent
var newdoc = frappe.model.copy_doc(this.doctype, dn, from_amend);
newdoc.idx = null;
// copy chidren
var dl = make_doclist(this.doctype, dn);

3
frappe/website/doctype/website_group/website_group.py
View file

@ -10,9 +10,6 @@ from frappe.model.doc import make_autoname
class DocType(WebsiteGenerator):
def __init__(self, d, dl):
self.doc, self.doclist = d, dl
def autoname(self):
self.doc.name = make_autoname("Website-Group-.######")
def get_page_title(self):
return self.doc.group_title

3
frappe/website/doctype/website_group/website_group.txt
View file

@ -2,7 +2,7 @@
{
"creation": "2014-01-29 15:57:42",
"docstatus": 0,
"modified": "2014-02-10 14:38:13",
"modified": "2014-02-27 12:51:53",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -21,6 +21,7 @@
"permlevel": 0
},
{
"cancel": 0,
"create": 1,
"delete": 1,
"doctype": "DocPerm",

4
frappe/website/doctype/website_route/website_route.py
View file

@ -55,11 +55,11 @@ class DocType(DocTypeNestedSet):
def set_idx(self):
if self.doc.parent_website_route:
if self.doc.idx == None:
if not self.doc.idx == None:
self.set_idx_as_last()
else:
self.validate_previous_idx_exists()
def set_idx_as_last(self):
# new, append
self.doc.idx = int(frappe.db.sql("""select ifnull(max(ifnull(idx, -1)), -1)

2
frappe/website/statics.py
View file

@ -41,7 +41,7 @@ class sync(object):
self.get_index_txt(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
return

1
frappe/website/website_generator.py
View file

@ -14,6 +14,7 @@ def call_website_generator(bean, method, *args, **kwargs):
class WebsiteGenerator(DocListController):
def autoname(self):
self.doc.name = cleanup_page_name(self.get_page_title())
self.doc.append_number_if_name_exists()
def set_page_name(self):
"""set page name based on parent page_name and title"""