diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php index f9cebf3539..08ac42a876 100644 --- a/infolog/inc/class.infolog_ui.inc.php +++ b/infolog/inc/class.infolog_ui.inc.php @@ -2181,7 +2181,10 @@ class infolog_ui { $sel_options['action']['schedule'] = array('label' => 'Schedule', 'title' => 'Schedule appointment'); } - egw_framework::validate_file('.','edit','infolog'); + if ($GLOBALS['egw_info']['user']['apps']['stylite']) + { + $content['encryption_ts'] = filemtime(EGW_SERVER_ROOT.'/stylite/js/infolog-encryption.js'); + } $GLOBALS['egw_info']['flags']['app_header'] = lang('InfoLog').' - '. ($content['status_only'] ? lang('Edit Status') : lang('Edit')); $GLOBALS['egw_info']['flags']['params']['manual'] = array('page' => ($info_id ? 'ManualInfologEdit' : 'ManualInfologAdd')); @@ -2498,7 +2501,7 @@ class infolog_ui egw_link::get_data ($_GET['egw_data']); return false; } - + return $this->edit($this->bo->import_mail($mailContent['addresses'], $mailContent['subject'], $mailContent['message'], diff --git a/infolog/js/app.js b/infolog/js/app.js index 6a909051a9..eeecb885cf 100644 --- a/infolog/js/app.js +++ b/infolog/js/app.js @@ -636,7 +636,7 @@ app.classes.infolog = AppJS.extend( if (!app.stylite) { var self = this; - egw_LAB.script('stylite/js/infolog-encryption.js').wait(function() + egw_LAB.script('stylite/js/infolog-encryption.js?'+this.et2.getArrayMgr('content').data.encryption_ts).wait(function() { app.stylite = new app.classes.stylite; app.stylite.et2 = self.et2; @@ -648,5 +648,19 @@ app.classes.infolog = AppJS.extend( app.stylite.et2 = this.et2; app.stylite.toggleEncrypt.call(app.stylite, _event, _widget, _node); } + }, + + /** + * OnChange callback for responsible + * + * @param {jQuery.Event} _event + * @param {et2_widget} _widget + */ + onchangeResponsible: function(_event, _widget) + { + if (app.stylite && app.stylite.onchangeResponsible) + { + app.stylite.onchangeResponsible.call(app.stylite, _event, _widget); + } } }); diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet index 6727746982..8dec637073 100644 --- a/infolog/templates/default/edit.xet +++ b/infolog/templates/default/edit.xet @@ -112,7 +112,7 @@ - +