From 3fdce9467ab93f174d7c04a619a371cfd5e4e86a Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Thu, 7 Feb 2013 16:01:41 +0000 Subject: [PATCH] Finish splitting only_app out of application list --- etemplate/js/et2_widget_link.js | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/etemplate/js/et2_widget_link.js b/etemplate/js/et2_widget_link.js index 81a797f6e1..3a4ea1998f 100644 --- a/etemplate/js/et2_widget_link.js +++ b/etemplate/js/et2_widget_link.js @@ -28,10 +28,16 @@ var et2_link_to = et2_inputWidget.extend({ attributes: { - "application": { + "only_app": { "name": "Application", "type": "string", "default": "", + "description": "Limit to just this one application - hides app selection" + }, + "application_list": { + "name": "Application list", + "type": "any", + "default": "", "description": "Limit to the listed application or applications (comma seperated)" }, "blur": { @@ -181,6 +187,8 @@ var et2_link_to = et2_inputWidget.extend({ // Link-to var link_entry_attrs = { id: this.id + '_link_entry', + only_app: this.options.only_app, + application_list: this.options.applicaiton_list, blur: this.options.search_label ? this.options.search_label : this.egw().lang('Search...'), query: function() { self.link_button.hide(); self.comment.hide(); return true;}, select: function() {self.link_button.show(); self.comment.show(); return true;} @@ -291,10 +299,16 @@ et2_register_widget(et2_link_to, ["link-to"]); var et2_link_apps = et2_selectbox.extend({ attributes: { - "application": { + "only_app": { "name": "Application", "type": "string", "default": "", + "description": "Limit to just this one application - hides app selection" + }, + "application_list": { + "name": "Application list", + "type": "any", + "default": "", "description": "Limit to the listed application or applications (comma seperated)" } }, @@ -305,10 +319,10 @@ var et2_link_apps = et2_selectbox.extend({ var select_options = {}; // Limit to one app - if(this.options.application) { - select_options[_attrs.application] = this.egw().lang(_attrs.application); + if(this.options.only_app) { + select_options[_attrs.only_app] = this.egw().lang(_attrs.only_app); } else { - select_options = this.egw().link_app_list('query'); + select_options = this.options.application_list ? $this.options.applicaiton_list : this.egw().link_app_list('query'); // Check whether the options entry was found, if not read it from the // content array.