mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-07 15:12:51 +00:00
added query report and cleaned up wn.ui.Dialog
This commit is contained in:
@@ -120,7 +120,7 @@ Dashboard = function() {
|
|||||||
},
|
},
|
||||||
|
|
||||||
show_settings: function() {
|
show_settings: function() {
|
||||||
var d = new wn.widgets.Dialog({
|
var d = new wn.ui.Dialog({
|
||||||
title: 'Set Company Settings',
|
title: 'Set Company Settings',
|
||||||
width: 500,
|
width: 500,
|
||||||
fields: [
|
fields: [
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ MyProfile = function(wrapper) {
|
|||||||
//
|
//
|
||||||
this.make_form = function() {
|
this.make_form = function() {
|
||||||
var div = $a($td(this.tab, 0, 1), 'div');
|
var div = $a($td(this.tab, 0, 1), 'div');
|
||||||
this.form = new wn.widgets.FieldGroup()
|
this.form = new wn.ui.FieldGroup()
|
||||||
this.form.make_fields(div, [
|
this.form.make_fields(div, [
|
||||||
{fieldname:'first_name', fieldtype:'Data',label:'First Name',reqd:1},
|
{fieldname:'first_name', fieldtype:'Data',label:'First Name',reqd:1},
|
||||||
{fieldname:'last_name', fieldtype:'Data',label:'Last Name'},
|
{fieldname:'last_name', fieldtype:'Data',label:'Last Name'},
|
||||||
@@ -89,7 +89,7 @@ MyProfile = function(wrapper) {
|
|||||||
// change password
|
// change password
|
||||||
//
|
//
|
||||||
this.change_password = function() {
|
this.change_password = function() {
|
||||||
var d = new wn.widgets.Dialog({
|
var d = new wn.ui.Dialog({
|
||||||
title:'Change Password',
|
title:'Change Password',
|
||||||
width: 400,
|
width: 400,
|
||||||
fields: [
|
fields: [
|
||||||
@@ -121,7 +121,7 @@ MyProfile = function(wrapper) {
|
|||||||
//
|
//
|
||||||
|
|
||||||
this.change_image = function() {
|
this.change_image = function() {
|
||||||
var d = new wn.widgets.Dialog({
|
var d = new wn.ui.Dialog({
|
||||||
title: 'Set your Profile'
|
title: 'Set your Profile'
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -142,7 +142,7 @@ MyProfile = function(wrapper) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.change_background = function() {
|
this.change_background = function() {
|
||||||
var d = new wn.widgets.Dialog({
|
var d = new wn.ui.Dialog({
|
||||||
title: 'Set Background Image'
|
title: 'Set Background Image'
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ $.extend(erpnext.complete_setup, {
|
|||||||
},
|
},
|
||||||
|
|
||||||
prepare_dialog: function() {
|
prepare_dialog: function() {
|
||||||
var d = new wn.widgets.Dialog({
|
var d = new wn.ui.Dialog({
|
||||||
title: "Setup",
|
title: "Setup",
|
||||||
fields: [
|
fields: [
|
||||||
{fieldname:'first_name', label:'Your First Name', fieldtype:'Data', reqd: 1},
|
{fieldname:'first_name', label:'Your First Name', fieldtype:'Data', reqd: 1},
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) {
|
|||||||
console.log(r.exc);
|
console.log(r.exc);
|
||||||
} else {
|
} else {
|
||||||
//console.log(arguments);
|
//console.log(arguments);
|
||||||
var d = new wn.widgets.Dialog({
|
var d = new wn.ui.Dialog({
|
||||||
title: 'Email Digest: ' + dn,
|
title: 'Email Digest: ' + dn,
|
||||||
width: 800
|
width: 800
|
||||||
});
|
});
|
||||||
@@ -68,7 +68,7 @@ cur_frm.cscript.addremove_recipients = function(doc, dt, dn) {
|
|||||||
} else {
|
} else {
|
||||||
// Open a dialog and display checkboxes against email addresses
|
// Open a dialog and display checkboxes against email addresses
|
||||||
doc = locals[dt][dn];
|
doc = locals[dt][dn];
|
||||||
var d = new wn.widgets.Dialog({
|
var d = new wn.ui.Dialog({
|
||||||
title: 'Add/Remove Recipients',
|
title: 'Add/Remove Recipients',
|
||||||
width: 400
|
width: 400
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ function SMSManager() {
|
|||||||
me.dialog.show();
|
me.dialog.show();
|
||||||
}
|
}
|
||||||
this.make_dialog = function() {
|
this.make_dialog = function() {
|
||||||
var d = new wn.widgets.Dialog({
|
var d = new wn.ui.Dialog({
|
||||||
title: 'Send SMS',
|
title: 'Send SMS',
|
||||||
width: 400,
|
width: 400,
|
||||||
fields: [
|
fields: [
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ function KnowledgeBase(w) {
|
|||||||
|
|
||||||
// suggest a few users who can answer
|
// suggest a few users who can answer
|
||||||
this.suggest = function() {
|
this.suggest = function() {
|
||||||
this.dialog = new wn.widgets.Dialog({
|
this.dialog = new wn.ui.Dialog({
|
||||||
title: 'Suggest a users',
|
title: 'Suggest a users',
|
||||||
width: 400,
|
width: 400,
|
||||||
fields: [
|
fields: [
|
||||||
|
|||||||
@@ -137,8 +137,7 @@ erpnext.todo.ToDoItem = Class.extend({
|
|||||||
|
|
||||||
erpnext.todo.make_dialog = function(det) {
|
erpnext.todo.make_dialog = function(det) {
|
||||||
if(!erpnext.todo.dialog) {
|
if(!erpnext.todo.dialog) {
|
||||||
var dialog = new wn.widgets.Dialog();
|
var dialog = new wn.ui.Dialog({
|
||||||
dialog.make({
|
|
||||||
width: 480,
|
width: 480,
|
||||||
title: 'To Do',
|
title: 'To Do',
|
||||||
fields: [
|
fields: [
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ $.extend(wn.pages.users, {
|
|||||||
},
|
},
|
||||||
make_settings_dialog: function() {
|
make_settings_dialog: function() {
|
||||||
var me = wn.pages.users;
|
var me = wn.pages.users;
|
||||||
me.settings_dialog = new wn.widgets.Dialog({
|
me.settings_dialog = new wn.ui.Dialog({
|
||||||
title: 'Set User Security',
|
title: 'Set User Security',
|
||||||
width: 500,
|
width: 500,
|
||||||
fields: [
|
fields: [
|
||||||
@@ -205,7 +205,7 @@ $.extend(wn.pages.users, {
|
|||||||
},
|
},
|
||||||
get_password: function(btn, args) {
|
get_password: function(btn, args) {
|
||||||
var me = wn.pages.users;
|
var me = wn.pages.users;
|
||||||
var pass_d = new wn.widgets.Dialog({
|
var pass_d = new wn.ui.Dialog({
|
||||||
title: 'Your Password',
|
title: 'Your Password',
|
||||||
width: 300,
|
width: 300,
|
||||||
fields: [
|
fields: [
|
||||||
@@ -244,7 +244,7 @@ $.extend(wn.pages.users, {
|
|||||||
{active_users: active_users.length}));
|
{active_users: active_users.length}));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var d = new wn.widgets.Dialog({
|
var d = new wn.ui.Dialog({
|
||||||
title: 'Add User',
|
title: 'Add User',
|
||||||
width: 400,
|
width: 400,
|
||||||
fields: [{
|
fields: [{
|
||||||
@@ -282,7 +282,7 @@ $.extend(wn.pages.users, {
|
|||||||
|
|
||||||
erpnext.RoleEditor = Class.extend({
|
erpnext.RoleEditor = Class.extend({
|
||||||
init: function() {
|
init: function() {
|
||||||
this.dialog = new wn.widgets.Dialog({
|
this.dialog = new wn.ui.Dialog({
|
||||||
title: 'Set Roles'
|
title: 'Set Roles'
|
||||||
});
|
});
|
||||||
var me = this;
|
var me = this;
|
||||||
@@ -407,7 +407,7 @@ erpnext.RoleEditor = Class.extend({
|
|||||||
|
|
||||||
},
|
},
|
||||||
make_perm_dialog: function() {
|
make_perm_dialog: function() {
|
||||||
this.perm_dialog = new wn.widgets.Dialog({
|
this.perm_dialog = new wn.ui.Dialog({
|
||||||
title:'Role Permissions',
|
title:'Role Permissions',
|
||||||
width: 500
|
width: 500
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ erpnext.blog.make_comment_dialog = function(wrapper) {
|
|||||||
|
|
||||||
$comment_btn.click(function() {
|
$comment_btn.click(function() {
|
||||||
if(!erpnext.blog.comment_dialog) {
|
if(!erpnext.blog.comment_dialog) {
|
||||||
var d = new wn.widgets.Dialog({
|
var d = new wn.ui.Dialog({
|
||||||
title: 'Add Comment',
|
title: 'Add Comment',
|
||||||
fields: [
|
fields: [
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user