Procházet zdrojové kódy

minor fixes for address and contact list rendering (#2759)

* [minor] check if contact_list & addr_list is available before rendering contact and address list

* [minor] hide new button if create permission is not available
version-14
Makarand Bauskar před 8 roky
committed by Rushabh Mehta
rodič
revize
d86c5e9f6f
3 změnil soubory, kde provedl 13 přidání a 10 odebrání
  1. +2
    -1
      frappe/geo/address_and_contact.py
  2. +9
    -7
      frappe/public/js/frappe/misc/address_and_contact.js
  3. +2
    -2
      frappe/public/js/frappe/views/treeview.js

+ 2
- 1
frappe/geo/address_and_contact.py Zobrazit soubor

@@ -25,6 +25,7 @@ def load_address_and_contact(doc, key):

doc.set_onload('addr_list', address_list)

contact_list = []
if doc.doctype != "Lead":
filters = [
["Dynamic Link", "link_doctype", "=", doc.doctype],
@@ -38,7 +39,7 @@ def load_address_and_contact(doc, key):
(int(a.is_primary_contact - b.is_primary_contact)) or
(1 if a.modified - b.modified else 0), reverse=True)

doc.set_onload('contact_list', contact_list)
doc.set_onload('contact_list', contact_list)

def set_default_role(doc, method):
'''Set customer, supplier, student based on email'''


+ 9
- 7
frappe/public/js/frappe/misc/address_and_contact.js Zobrazit soubor

@@ -8,15 +8,17 @@ $.extend(frappe.geo, {

render_address_and_contact: function(frm) {
// render address
$(frm.fields_dict['address_html'].wrapper)
.html(frappe.render_template("address_list",
cur_frm.doc.__onload))
.find(".btn-address").on("click", function() {
frappe.new_doc("Address");
});
if(frm.fields_dict['address_html'] && "addr_list" in frm.doc.__onload) {
$(frm.fields_dict['address_html'].wrapper)
.html(frappe.render_template("address_list",
cur_frm.doc.__onload))
.find(".btn-address").on("click", function() {
frappe.new_doc("Address");
});
}

// render contact
if(frm.fields_dict['contact_html']) {
if(frm.fields_dict['contact_html'] && "contact_list" in frm.doc.__onload) {
$(frm.fields_dict['contact_html'].wrapper)
.html(frappe.render_template("contact_list",
cur_frm.doc.__onload))


+ 2
- 2
frappe/public/js/frappe/views/treeview.js Zobrazit soubor

@@ -149,7 +149,7 @@ frappe.views.TreeView = Class.extend({
var toolbar = [
{toggle_btn: true},
{
label:__("Edit"),
label:__(me.can_write? "Edit": "Details"),
condition: function(node) {
return !node.root && me.can_read;
},
@@ -283,7 +283,7 @@ frappe.views.TreeView = Class.extend({
},
set_primary_action: function(){
var me = this;
if (!this.opts.disable_add_node) {
if (!this.opts.disable_add_node && this.can_create) {
me.page.set_primary_action(__("New"), function() {
me.new_node();
}, "octicon octicon-plus")


Načítá se…
Zrušit
Uložit