extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 09:58:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed problem with infolog-image 'not-started' not found in grid; causes new problem with some buttons being displayed twice (caused by this.image=null in et2_widget_button.js::180)

Browse Source
This commit is contained in:
Andreas Stöckel 2012-03-06 16:29:18 +00:00
parent cbcefbeb1f
commit 69c7697e61
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etemplate/js/et2_extension_customfields.js
View File

@ -235,8 +235,8 @@ var et2_customfields_list = et2_DOMWidget.extend([et2_IDetachedDOM], {
}, },
/** /**
* Code for implementing et2_IDetachedDOM * Code for implementing et2_IDetachedDOM
*/ */
getDetachedAttributes: function(_attrs) getDetachedAttributes: function(_attrs)
{ {
_attrs.push("value", "class"); _attrs.push("value", "class");

21
etemplate/js/et2_extension_nextmatch.js
View File

@ -300,7 +300,6 @@ var et2_nextmatch = et2_DOMWidget.extend(et2_IResizeable, {
return colName; return colName;
}, },
/** /**
* Apply stored user preferences to discovered columns * Apply stored user preferences to discovered columns
*/ */
@ -1040,9 +1039,9 @@ et2_register_widget(et2_nextmatch_header, ['nextmatch-header',
var et2_nextmatch_customfields = et2_nextmatch_header.extend({ var et2_nextmatch_customfields = et2_nextmatch_header.extend({
attributes: { attributes: {
'customfields': { 'customfields': {
'name': 'Custom fields', 'name': 'Custom fields',
'description': 'Auto filled' 'description': 'Auto filled'
}, },
'fields': { 'fields': {
'name': "Visible fields", 'name': "Visible fields",
"description": "Auto filled" "description": "Auto filled"
@ -1052,10 +1051,10 @@ var et2_nextmatch_customfields = et2_nextmatch_header.extend({
init: function() { init: function() {
// Create the table body and the table // Create the table body and the table
this.tbody = $j(document.createElement("tbody")); this.tbody = $j(document.createElement("tbody"));
this.table = $j(document.createElement("table")) this.table = $j(document.createElement("table"))
.addClass("et2_grid"); .addClass("et2_grid");
this.table.append(this.tbody); this.table.append(this.tbody);
this.rows = {}; this.rows = {};
this._super.apply(this, arguments); this._super.apply(this, arguments);
@ -1114,9 +1113,9 @@ var et2_nextmatch_customfields = et2_nextmatch_header.extend({
// Table row // Table row
var row = jQuery(document.createElement("tr")) var row = jQuery(document.createElement("tr"))
.appendTo(this.tbody); .appendTo(this.tbody);
var cf = jQuery(document.createElement("td")) var cf = jQuery(document.createElement("td"))
.appendTo(row); .appendTo(row);
this.rows[field_name] = cf[0]; this.rows[field_name] = cf[0];
// Create widget by type // Create widget by type

5
etemplate/js/et2_widget_button.js
View File

@ -68,7 +68,10 @@ var et2_button = et2_baseWidget.extend([et2_IInput, et2_IDetachedDOM], {
{ {
if(!this.image) if(!this.image)
{ {
this.image = et2_createWidget("image",{label: this.options.label}); this.image = et2_createWidget("image",
{
label: this.options.label
}, this);
} }
found_image = this.image.set_src(this.options.image); found_image = this.image.set_src(this.options.image);
if(found_image) { if(found_image) {

1
etemplate/js/et2_widget_image.js
View File

@ -122,6 +122,7 @@ var et2_image = et2_baseWidget.extend([et2_IDetachedDOM], {
} }
this.options.src = _value; this.options.src = _value;
var app = this.egw().getAppName(); var app = this.egw().getAppName();
// Handle app/image // Handle app/image