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

[cleanup] for pos

Browse source
This commit is contained in:
Rushabh Mehta 2015-03-05 15:06:01 +05:30
parent 5034e7e660
commit 75834b555f
3 changed files with 64 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frappe/public/js/frappe/form/control.js
View file

@ -39,7 +39,8 @@ frappe.ui.form.Control = Class.extend({
},
toggle: function(show) {
this.$wrapper.toggleClass("hide-control", !!!show);
this.df.hidden = show ? 0 : 1;
this.refresh();
},
// returns "Read", "Write" or "None"

99
frappe/public/js/frappe/form/toolbar.js
View file

@ -20,8 +20,10 @@ frappe.ui.form.Toolbar = Class.extend({
} else {
if(this.frm.doc.__islocal) {
this.page.hide_menu();
this.print_icon && this.print_icon.addClass("hide");
} else {
this.page.show_menu();
this.print_icon && this.print_icon.removeClass("hide");
}
}
},
@ -154,14 +156,22 @@ frappe.ui.form.Toolbar = Class.extend({
this.frm.linked_with.show();
},
set_primary_action: function(dirty) {
var me = this,
status = null;
if (!dirty) {
// don't clear actions menu if dirty
this.page.clear_user_actions();
}
status = this.get_action_status();
if (status) {
if (status !== this.current_status) {
this.set_page_actions(status);
}
} else {
this.page.clear_actions();
}
},
get_action_status: function() {
var status = null;
if (this.can_submit()) {
status = "Submit";
} else if (this.can_save()) {
@ -175,51 +185,48 @@ frappe.ui.form.Toolbar = Class.extend({
} else if (this.can_amend()) {
status = "Amend";
}
return status;
},
set_page_actions: function(status) {
var me = this;
this.page.clear_actions();
if (status) {
if (status !== this.current_status) {
this.page.clear_actions();
var perm_to_check = this.frm.action_perm_type_map[status];
if(!this.frm.perm[0][perm_to_check]) {
return;
}
if(status == "Cancel") {
this.page.set_secondary_action(__(status), function() {
me.frm.savecancel(this);
}, "octicon octicon-circle-slash");
} else {
var click = {
"Save": function() {
me.frm.save('Save', null, this);
},
"Submit": function() {
me.frm.savesubmit(this);
},
"Update": function() {
me.frm.save('Update', null, this);
},
"Amend": function() {
me.frm.amend_doc();
}
}[status];
var icon = {
"Save": "octicon octicon-check",
"Submit": "octicon octicon-lock",
"Update": "octicon octicon-check",
"Amend": "octicon octicon-split"
}[status];
this.page.set_primary_action(__(status), click, icon);
}
this.current_status = status;
}
} else {
this.page.clear_actions();
var perm_to_check = this.frm.action_perm_type_map[status];
if(!this.frm.perm[0][perm_to_check]) {
return;
}
if(status == "Cancel") {
this.page.set_secondary_action(__(status), function() {
me.frm.savecancel(this);
}, "octicon octicon-circle-slash");
} else {
var click = {
"Save": function() {
me.frm.save('Save', null, this);
},
"Submit": function() {
me.frm.savesubmit(this);
},
"Update": function() {
me.frm.save('Update', null, this);
},
"Amend": function() {
me.frm.amend_doc();
}
}[status];
var icon = {
"Save": "octicon octicon-check",
"Submit": "octicon octicon-lock",
"Update": "octicon octicon-check",
"Amend": "octicon octicon-split"
}[status];
this.page.set_primary_action(__(status), click, icon);
}
this.current_status = status;
},
make_cancel_amend_button: function() {
var me = this;

18
frappe/public/js/frappe/ui/page.js
View file

@ -168,11 +168,17 @@ frappe.ui.Page = Class.extend({
show_menu: function() {
this.menu_btn_group.removeClass("hide");
this.icon_group.removeClass("hide");
},
hide_menu: function() {
this.menu_btn_group.addClass("hide");
},
show_icon_group: function() {
this.icon_group.removeClass("hide");
},
hide_icon_group: function() {
this.icon_group.addClass("hide");
},
@ -268,17 +274,11 @@ frappe.ui.Page = Class.extend({
},
add_help_button: function(txt) {
this.add_icon_btn("2", "icon-question-sign", __("Help"),
function() { msgprint($(this).data('help-text'), 'Help'); })
.data("help-text", txt);
},
add_icon_btn: function(group, icon, label, click) {
return this.iconbar.add_btn(group, icon, label, click);
//
},
add_button: function(label, click, icon, is_title) {
return this.add_icon_btn("1", icon, __(label), click);
//
},
add_dropdown_button: function(parent, label, click, icon) {