From bb43f1a81667cbc072dbfbde0b5830940ec0f0b2 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Thu, 2 Jan 2014 11:16:31 +0530 Subject: [PATCH] method names prefix fixes --- webnotes/core/doctype/communication/communication.js | 2 +- webnotes/core/doctype/profile/profile.js | 3 +-- webnotes/public/js/wn/form/assign_to.js | 2 +- webnotes/public/js/wn/views/communication.js | 2 +- webnotes/templates/includes/login.js | 4 ++-- webnotes/templates/pages/update-password.html | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/webnotes/core/doctype/communication/communication.js b/webnotes/core/doctype/communication/communication.js index b2b31b60ab..b8bd40c06d 100644 --- a/webnotes/core/doctype/communication/communication.js +++ b/webnotes/core/doctype/communication/communication.js @@ -1,7 +1,7 @@ cur_frm.cscript.onload = function(doc) { cur_frm.fields_dict.user.get_query = function() { return { - query: "core.doctype.communication.communication.get_user" + query: "webnotes.core.doctype.communication.communication.get_user" } }; diff --git a/webnotes/core/doctype/profile/profile.js b/webnotes/core/doctype/profile/profile.js index ba14e18ca4..58178ab7b7 100644 --- a/webnotes/core/doctype/profile/profile.js +++ b/webnotes/core/doctype/profile/profile.js @@ -20,11 +20,10 @@ cur_frm.cscript.before_load = function(doc, dt, dn, callback) { wn.call({ method: "webnotes.core.doctype.profile.profile.get_languages", callback: function(r) { - console.log(r.message); wn.languages = r.message; update_language_select(); } - }) + }); } else { update_language_select(); } diff --git a/webnotes/public/js/wn/form/assign_to.js b/webnotes/public/js/wn/form/assign_to.js index 271c74cb96..af2111bfd9 100644 --- a/webnotes/public/js/wn/form/assign_to.js +++ b/webnotes/public/js/wn/form/assign_to.js @@ -130,7 +130,7 @@ wn.ui.form.AssignTo = Class.extend({ }); } } - me.dialog.fields_dict.assign_to.get_query = "core.doctype.profile.profile.profile_query"; + me.dialog.fields_dict.assign_to.get_query = "webnotes.core.doctype.profile.profile.profile_query"; } me.dialog.clear(); diff --git a/webnotes/public/js/wn/views/communication.js b/webnotes/public/js/wn/views/communication.js index 81728506ec..012f9fde10 100644 --- a/webnotes/public/js/wn/views/communication.js +++ b/webnotes/public/js/wn/views/communication.js @@ -301,7 +301,7 @@ wn.views.CommunicationComposer = Class.extend({ }; return wn.call({ - method:"core.doctype.communication.communication.make", + method:"webnotes.core.doctype.communication.communication.make", args: { sender: [wn.user_info(user).fullname, wn.boot.profile.email], recipients: form_values.recipients, diff --git a/webnotes/templates/includes/login.js b/webnotes/templates/includes/login.js index acc55d2a5c..5cc23a3573 100644 --- a/webnotes/templates/includes/login.js +++ b/webnotes/templates/includes/login.js @@ -25,7 +25,7 @@ $(window).on("hashchange", function() { login.do_login = function(){ var args = {}; if(window.is_sign_up) { - args.cmd = "core.doctype.profile.profile.sign_up"; + args.cmd = "webnotes.core.doctype.profile.profile.sign_up"; args.email = ($("#login_id").val() || "").trim(); args.full_name = ($("#full_name").val() || "").trim(); @@ -34,7 +34,7 @@ login.do_login = function(){ return false; } } else if(window.is_forgot) { - args.cmd = "core.doctype.profile.profile.reset_password"; + args.cmd = "webnotes.core.doctype.profile.profile.reset_password"; args.user = ($("#login_id").val() || "").trim(); if(!args.user) { diff --git a/webnotes/templates/pages/update-password.html b/webnotes/templates/pages/update-password.html index 58de99a876..caba990db2 100644 --- a/webnotes/templates/pages/update-password.html +++ b/webnotes/templates/pages/update-password.html @@ -56,7 +56,7 @@ $(document).ready(function() { wn.call({ type: "POST", - method: "core.doctype.profile.profile.update_password", + method: "webnotes.core.doctype.profile.profile.update_password", btn: $("#update"), args: args, callback: function(r) {