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

[fixes] rename ctype to doctype

Browse source
This commit is contained in:
Saurabh 2016-06-24 11:36:52 +05:30
parent 1d7a9ea2df
commit 3209cb274c
2 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
frappe/desk/treeview.py
View file

@ -4,11 +4,10 @@
from __future__ import unicode_literals
import frappe
@frappe.whitelist()
def get_children():
ctype = frappe.local.form_dict.get('ctype')
parent_field = 'parent_' + ctype.lower().replace(' ', '_')
doctype = frappe.local.form_dict.get('doctype')
parent_field = 'parent_' + doctype.lower().replace(' ', '_')
parent = frappe.form_dict.get("parent") or ""
return frappe.db.sql("""select name as value,
@ -16,22 +15,22 @@ def get_children():
from `tab{ctype}`
where docstatus < 2
and ifnull(`{parent_field}`,'') = %s
order by name""".format(ctype=frappe.db.escape(ctype), parent_field=frappe.db.escape(parent_field)),
order by name""".format(ctype=frappe.db.escape(doctype), parent_field=frappe.db.escape(parent_field)),
parent, as_dict=1)
@frappe.whitelist()
def add_node():
ctype = frappe.form_dict.get('ctype')
parent_field = 'parent_' + ctype.lower().replace(' ', '_')
name_field = ctype.lower().replace(' ', '_') + '_name'
doctype = frappe.form_dict.get('doctype')
parent_field = 'parent_' + doctype.lower().replace(' ', '_')
name_field = doctype.lower().replace(' ', '_') + '_name'
doc = frappe.new_doc(ctype)
doc = frappe.new_doc(doctype)
doc.update({
name_field: frappe.form_dict['name_field'],
parent_field: frappe.form_dict['parent'],
"is_group": frappe.form_dict['is_group']
})
if ctype == "Sales Person":
if doctype == "Sales Person":
doc.employee = frappe.form_dict.get('employee')
doc.save()

30
frappe/public/js/frappe/views/treeview.js
View file

@ -28,8 +28,8 @@ frappe.views.TreeView = Class.extend({
this.opts = {};
this.opts.get_tree_root = true;
$.extend(this.opts, opts);
this.ctype = opts.doctype;
this.args = {ctype: me.ctype};
this.doctype = opts.doctype;
this.args = {doctype: me.doctype};
this.page_name = frappe.get_route_str();
this.get_tree_nodes = me.opts.get_tree_nodes || "frappe.desk.treeview.get_children";
@ -45,11 +45,11 @@ frappe.views.TreeView = Class.extend({
this.set_primary_action();
},
get_permissions: function(){
this.can_read = frappe.model.can_read(this.ctype);
this.can_create = frappe.boot.user.can_create.indexOf(this.ctype) !== -1 ||
frappe.boot.user.in_create.indexOf(this.ctype) !== -1;
this.can_write = frappe.model.can_write(this.ctype);
this.can_delete = frappe.model.can_delete(this.ctype);
this.can_read = frappe.model.can_read(this.doctype);
this.can_create = frappe.boot.user.can_create.indexOf(this.doctype) !== -1 ||
frappe.boot.user.in_create.indexOf(this.doctype) !== -1;
this.can_write = frappe.model.can_write(this.doctype);
this.can_delete = frappe.model.can_delete(this.doctype);
},
make_page: function() {
var me = this;
@ -58,9 +58,9 @@ frappe.views.TreeView = Class.extend({
this.page = this.parent.page;
frappe.container.change_to(this.page_name);
frappe.breadcrumbs.add(me.opts.breadcrumb || locals.DocType[me.ctype].module);
frappe.breadcrumbs.add(me.opts.breadcrumb || locals.DocType[me.doctype].module);
this.page.set_title(me.opts.title || __('{0} Tree',[__(this.ctype)]) );
this.page.set_title(me.opts.title || __('{0} Tree',[__(this.doctype)]) );
this.page.main.css({
"min-height": "300px",
"padding-bottom": "25px"
@ -119,7 +119,7 @@ frappe.views.TreeView = Class.extend({
return !node.root && me.can_read;
},
click: function(node) {
frappe.set_route("Form", me.ctype, node.label);
frappe.set_route("Form", me.doctype, node.label);
}
},
{
@ -134,7 +134,7 @@ frappe.views.TreeView = Class.extend({
label:__("Rename"),
condition: function(node) { return !node.root && me.can_write; },
click: function(node) {
frappe.model.rename_doc(me.ctype, node.label, function(new_name) {
frappe.model.rename_doc(me.doctype, node.label, function(new_name) {
node.$a.html(new_name);
});
},
@ -144,7 +144,7 @@ frappe.views.TreeView = Class.extend({
label:__("Delete"),
condition: function(node) { return !node.root && me.can_delete; },
click: function(node) {
frappe.model.delete_doc(me.ctype, node.label, function() {
frappe.model.delete_doc(me.doctype, node.label, function() {
node.parent.remove();
});
},
@ -167,7 +167,7 @@ frappe.views.TreeView = Class.extend({
// the dialog
var d = new frappe.ui.Dialog({
title: __('New {0}',[__(me.ctype)]),
title: __('New {0}',[__(me.doctype)]),
fields: me.fields
})
@ -180,7 +180,7 @@ frappe.views.TreeView = Class.extend({
var node = me.tree.get_selected_node();
v.parent = node.label;
v.ctype = me.ctype;
v.doctype = me.doctype;
if(node.root) {
v.is_root = 1;
@ -213,7 +213,7 @@ frappe.views.TreeView = Class.extend({
this.fields = [
{fieldtype:'Data', fieldname: 'name_field',
label:__('New {0} Name',[__(me.ctype)]), reqd:true},
label:__('New {0} Name',[__(me.doctype)]), reqd:true},
{fieldtype:'Select', fieldname:'is_group', label:__('Group Node'), options:'No\nYes',
description: __("Further nodes can be only created under 'Group' type nodes")}
]