Finish splitting only_app out of application list

This commit is contained in:
Nathan Gray 2013-02-07 16:01:41 +00:00
parent ca3536bf25
commit 3fdce9467a

View File

@ -28,10 +28,16 @@
var et2_link_to = et2_inputWidget.extend({ var et2_link_to = et2_inputWidget.extend({
attributes: { attributes: {
"application": { "only_app": {
"name": "Application", "name": "Application",
"type": "string", "type": "string",
"default": "", "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)" "description": "Limit to the listed application or applications (comma seperated)"
}, },
"blur": { "blur": {
@ -181,6 +187,8 @@ var et2_link_to = et2_inputWidget.extend({
// Link-to // Link-to
var link_entry_attrs = { var link_entry_attrs = {
id: this.id + '_link_entry', 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...'), blur: this.options.search_label ? this.options.search_label : this.egw().lang('Search...'),
query: function() { self.link_button.hide(); self.comment.hide(); return true;}, query: function() { self.link_button.hide(); self.comment.hide(); return true;},
select: function() {self.link_button.show(); self.comment.show(); 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({ var et2_link_apps = et2_selectbox.extend({
attributes: { attributes: {
"application": { "only_app": {
"name": "Application", "name": "Application",
"type": "string", "type": "string",
"default": "", "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)" "description": "Limit to the listed application or applications (comma seperated)"
} }
}, },
@ -305,10 +319,10 @@ var et2_link_apps = et2_selectbox.extend({
var select_options = {}; var select_options = {};
// Limit to one app // Limit to one app
if(this.options.application) { if(this.options.only_app) {
select_options[_attrs.application] = this.egw().lang(_attrs.application); select_options[_attrs.only_app] = this.egw().lang(_attrs.only_app);
} else { } 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 // Check whether the options entry was found, if not read it from the
// content array. // content array.