[fix] desktop icon missing filter

This commit is contained in:
Rushabh Mehta 2016-03-21 18:27:18 +05:30
parent e779e7aef9
commit 5bd744df32
5 changed files with 10 additions and 7 deletions

View file

@ -1,3 +1,6 @@
- Configurable Desktop
- Add any Documents, Reports, Modules, Pages to the desktop
- Remove all the unwanted icons
- Remove all the unwanted icons
- **Module Page New Design**
- New module design now shows all documents in a module together
- [Read the Details](https://frappe.io/blog/erpnext-features/configurable-desktop)

View file

@ -87,7 +87,7 @@ def get_desktop_icons(user=None):
@frappe.whitelist()
def add_user_icon(label, link, type, _doctype):
'''Add a new user desktop icon to the desktop'''
icon_name = frappe.db.exists('Desktop Icon', {'standard': 0, 'link': link})
icon_name = frappe.db.exists('Desktop Icon', {'standard': 0, 'link': link, 'owner': frappe.session.user})
if icon_name and frappe.db.get_value('Desktop Icon', icon_name, 'hidden'):
frappe.db.set_value('Desktop Icon', icon_name, 'hidden', 0)
clear_desktop_icons_cache()

View file

@ -440,7 +440,6 @@ textarea.form-control {
}
.open-notification {
position: relative;
top: -2px;
left: 2px;
display: inline-block;
background: #ff5858;

View file

@ -1302,11 +1302,13 @@ frappe.ui.form.ControlDynamicLink = frappe.ui.form.ControlLink.extend({
if(this.df.get_options) {
return this.df.get_options();
}
if (this.docname==null && cur_dialog!=null){ //for dialog box
if (this.docname==null && cur_dialog) {
//for dialog box
return cur_dialog.get_value(this.df.options)
}
if (cur_frm==null){//for list page
return $("input[data-fieldname*="+this.df.options+"]").val()
if (cur_frm==null && cur_list){
//for list page
return cur_list.wrapper.find("input[data-fieldname*="+this.df.options+"]").val()
}
var options = frappe.model.get_value(this.df.parent, this.docname, this.df.options);
// if(!options) {

View file

@ -278,7 +278,6 @@ textarea.form-control {
.open-notification {
position:relative;
top:-2px;
left: 2px;
display:inline-block;
background:#ff5858;