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

fix not camelCase attribute name, sanitize app-names to 16 chars and use "infolog" for CRM-view

Browse Source 
still not fully working, as NM controller somehow overwrites it again :(
This commit is contained in:
ralf 2022-08-16 10:10:36 +02:00
parent ffc4fe36a0
commit 2a7d05a545
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/js/etemplate/Et2Link/Et2LinkAppSelect.ts
View File

@ -112,9 +112,9 @@ export class Et2LinkAppSelect extends SlotMixin(Et2Select)
{ {
// use preference // use preference
let appname = ""; let appname = "";
if(typeof this.value != 'undefined' && this.parentNode && this.parentNode.to_app) if(typeof this.value != 'undefined' && this.parentNode && this.parentNode.toApp)
{ {
appname = this.parentNode.to_app; appname = this.parentNode.toApp;
} }
this.value = this.egw().preference('link_app', appname || this.egw().app_name()); this.value = this.egw().preference('link_app', appname || this.egw().app_name());
} }
@ -181,9 +181,9 @@ export class Et2LinkAppSelect extends SlotMixin(Et2Select)
// update preference // update preference
let appname = ""; let appname = "";
if(typeof this.value != 'undefined' && this.parentNode && this.parentNode.to_app) if(typeof this.value != 'undefined' && this.parentNode && this.parentNode.toApp)
{ {
appname = this.parentNode.to_app; appname = this.parentNode.toApp;
} }
this.egw().set_preference(appname || this.egw().app_name(), 'link_app', this.value); this.egw().set_preference(appname || this.egw().app_name(), 'link_app', this.value);
} }

32
api/js/jsapi/egw_preferences.js
View File

@ -28,6 +28,29 @@ egw.extend('preferences', egw.MODULE_GLOBAL, function()
var prefs = {}; var prefs = {};
var grants = {}; var grants = {};
/**
* App-names in egw_preference table are limited to 16 chars, so we can not store anything longer
*
* Also modify tab-names used in CRM-view ("addressbook-*") to "infolog".
*
* @param _app
* @returns {string}
*/
function sanitizeApp(_app)
{
if (typeof _app === 'undefined') _app = 'common';
if (_app.length > 16)
{
_app = _app.substring(0, 16);
}
if (_app.match(/^addressbook-/))
{
_app = 'infolog';
}
return _app;
}
// Return the actual extension // Return the actual extension
return { return {
/** /**
@ -46,7 +69,7 @@ egw.extend('preferences', egw.MODULE_GLOBAL, function()
} }
else else
{ {
prefs[_app] = jQuery.extend(true, {}, _data); // we always clone here, as call can come from this.preferences! prefs[sanitizeApp(_app)] = jQuery.extend(true, {}, _data); // we always clone here, as call can come from this.preferences!
} }
}, },
@ -68,7 +91,7 @@ egw.extend('preferences', egw.MODULE_GLOBAL, function()
*/ */
preference: function(_name, _app, _callback, _context) preference: function(_name, _app, _callback, _context)
{ {
if (typeof _app === 'undefined') _app = 'common'; _app = sanitizeApp(_app);
if (typeof prefs[_app] === 'undefined') if (typeof prefs[_app] === 'undefined')
{ {
@ -111,6 +134,8 @@ egw.extend('preferences', egw.MODULE_GLOBAL, function()
*/ */
set_preference: function(_app, _name, _val, _callback) set_preference: function(_app, _name, _val, _callback)
{ {
_app = sanitizeApp(_app);
// if there is no change, no need to submit it to server // if there is no change, no need to submit it to server
if (typeof prefs[_app] != 'undefined') if (typeof prefs[_app] != 'undefined')
{ {
@ -124,7 +149,7 @@ egw.extend('preferences', egw.MODULE_GLOBAL, function()
this.jsonq('EGroupware\\Api\\Framework::ajax_set_preference',[_app, _name, _val], _callback); this.jsonq('EGroupware\\Api\\Framework::ajax_set_preference',[_app, _name, _val], _callback);
// update own preference cache, if _app prefs are loaded (dont update otherwise, as it would block loading of other _app prefs!) // update own preference cache, if _app prefs are loaded (don't update otherwise, as it would block loading of other _app prefs!)
if (typeof prefs[_app] != 'undefined') if (typeof prefs[_app] != 'undefined')
{ {
if (_val === undefined || _val === "" || _val === null) if (_val === undefined || _val === "" || _val === null)
@ -254,4 +279,3 @@ egw.extend('preferences', egw.MODULE_GLOBAL, function()
} }
}; };
}); });