Changeset 2308

Timestamp:

11/03/08 17:25:33 (2 months ago)

Author:

aperez

Message:

Files:

cherokee/trunk/ChangeLog

r2307	r2308
	1	2008-11-03 Antonio Perez <aperez@skarcha.com>
	2
	3	* admin/ModuleCgi.py, admin/static/js/common.js, admin/Entry.py:
	4	Adds support for Custom Environment Variables. Bug #188:
	5	http://code.google.com/p/cherokee/issues/detail?id=188
	6
1	7	2008-11-03 Alvaro Lopez Ortega <alvaro@octality.com>
2	8

r2067	r2308
17	17	self._kwargs['class']='required'
18	18	del kwargs['req']
	19
	20	if 'noautosubmit' in kwargs and kwargs['noautosubmit'] == True:
	21	self._kwargs['class']='noautosubmit'
	22	del kwargs['noautosubmit']
19	23
20	24	def _init_value (self, cfg):

r1987	r2308
21	21	'check_file',
22	22	'pass_req_headers',
23		'xsendfile'
	23	'xsendfile',
	24	'env'
24	25	]
25	26
…	…
49	50	txt += self.Indent(table)
50	51
	52	txt1 = '<h2>Custom environment variables</h2>'
	53	envs = self._cfg.keys('%s!env'%(self._prefix))
	54	if envs:
	55	table = Table(3, title_left=1, style='width="90%"')
	56
	57	for env in envs:
	58	pre = '%s!env!%s'%(self._prefix,env)
	59	val = self.InstanceEntry(pre, 'text', size=25)
	60	js = "post_del_key('/ajax/update', '%s');"%(pre)
	61	link_del = self.InstanceImage ("bin.png", "Delete", border="0", onClick=js)
	62	table += (env, val, link_del)
	63
	64	txt1 += self.Indent(table)
	65
	66	txt1 += '<h3>Add new custom environment variable</h3>';
	67	name = self.InstanceEntry('new_custom_env_name', 'text', size=25, noautosubmit=True)
	68	value = self.InstanceEntry('new_custom_env_value', 'text', size=25, noautosubmit=True)
	69
	70	table = Table(3, 1, style='width="90%"')
	71	table += ('Name', 'Value', '')
	72	table += (name, value, SUBMIT_ADD)
	73	txt1 += self.Indent(table)
	74	txt += txt1
	75
51	76	return txt
52	77
53	78	def _op_apply_changes (self, uri, post):
	79	new_name = post.pop('new_custom_env_name')
	80	new_value = post.pop('new_custom_env_value')
	81
	82	if new_name and new_value:
	83	self._cfg['%s!env!%s'%(self._prefix, new_name)] = new_value
	84
54	85	checkboxes = ['error_handler', 'pass_req_headers', 'xsendfile']
55	86

r2287	r2308
131	131	value = self.InstanceEntry('new_env_value', 'text', size=25)
132	132
133		table = Table(3, 1, style='width="90%%"')
	133	table = Table(3, 1, style='width="90%"')
134	134	table += ('Variable', 'Value', '')
135	135	table += (name, value, SUBMIT_ADD)
…	…
194	194
195	195	txt += "<h2>Known sources</h2>"
196		table = '<table width="90%%" id="sources" class="rulestable">'
	196	table = '<table width="90%" id="sources" class="rulestable">'
197	197	table += '<tr><th>Nick</th><th>Type</th><th>Connection</th></tr>'
198	198

r2250	r2308
159	159	/* Auto submission of some forms */
160	160	function autosubmit(event) {
161		$(".auto input").change(function(event) {
162		if (check_all_or_none('required')) {
163		setConfirmUnload(false);
164		this.form.submit();
165		}
166		});
	161	$(".auto input").change(function(event) {
	162	if (this.className == 'noautosubmit') {
	163	return false;
	164	}
	165
	166	if (check_all_or_none('required')) {
	167	setConfirmUnload(false);
	168	this.form.submit();
	169	}
	170	});
167	171	}
168	172