extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-09 01:24:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken delete of link when to_id is not set (not saved entry)

Browse Source
This commit is contained in:
Nathan Gray 2014-03-04 00:26:42 +00:00
parent d2b2f71058
commit 5abc2eceef
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
etemplate/js/et2_widget_link.js
View File

@ -1465,7 +1465,10 @@ var et2_link_list = et2_link_string.extend(
.appendTo(delete_button) .appendTo(delete_button)
// We don't use ui-icon because it assigns a bg image // We don't use ui-icon because it assigns a bg image
.addClass("delete icon") .addClass("delete icon")
.bind( 'click', function() {self._delete_link(_link_data.link_id||_link_data, row);}); .bind( 'click', function() {self._delete_link(
self.value && typeof self.value.to_id != 'object' && _link_data.link_id ? _link_data.link_id:_link_data,
row
);});
// Context menu // Context menu
row.bind("contextmenu", function(e) { row.bind("contextmenu", function(e) {
@ -1491,11 +1494,26 @@ var et2_link_list = et2_link_string.extend(
// No link ID means a link on an unsaved entry. // No link ID means a link on an unsaved entry.
// Just remove the row, but need to adjust the link_to value also // Just remove the row, but need to adjust the link_to value also
row.slideUp(row.remove); row.slideUp(row.remove);
var value = link_id.widget.getValue();
if(value && value.to_id) // Look for a link-to with the same ID, refresh it
if(link_id.link_id)
{ {
delete value.to_id[link_id.value_index]; var self = this;
link_id.widget.set_value(value); var _widget = link_id.widget || null;
this.getRoot().iterateOver(
function(widget) {
if(widget.id == self.id) {
_widget = widget;
}
},
this, et2_link_to
);
var value = _widget != null ? _widget.getValue() : false;
if(_widget && value && value.to_id)
{
delete value.to_id[link_id.link_id];
_widget.set_value(value);
}
} }
} }
} }