View | Details | Raw Unified | Return to bug 31965
Collapse All | Expand All

(-)a/branches/ucs-3.1/ucs/base/univention-installer/installer/modules/80_join.py (-10 / +3 lines)
 Lines 36-41    Link Here 
36
# Results of this module need to be stored in the dictionary self.result (variablename:value[,value1,value2])
36
# Results of this module need to be stored in the dictionary self.result (variablename:value[,value1,value2])
37
#
37
#
38
38
39
import os
39
from objects import *
40
from objects import *
40
from local import _
41
from local import _
41
42
 Lines 91-98   class object(content): Link Here 
91
		self.elements.append(textline(_('Password'),self.minY+1,self.minX+5)) #10
92
		self.elements.append(textline(_('Password'),self.minY+1,self.minX+5)) #10
92
		self.elements.append(password('',self.minY+2,self.minX+5,30)) #11
93
		self.elements.append(password('',self.minY+2,self.minX+5,30)) #11
93
94
94
		self.elements.append(textline(_('Password (retype)'),self.minY+4,self.minX+5)) #12
95
		self.elements.append(password('',self.minY+5,self.minX+5,30)) #13
96
		self.join_host_search_disabled=1
95
		self.join_host_search_disabled=1
97
		self.elements[7].disable()
96
		self.elements[7].disable()
98
		self.join_disabled=0
97
		self.join_disabled=0
 Lines 112-124   class object(content): Link Here 
112
					self.elements[7].disable()
111
					self.elements[7].disable()
113
				self.elements[9].enable()
112
				self.elements[9].enable()
114
				self.elements[11].enable()
113
				self.elements[11].enable()
115
				self.elements[13].enable()
116
			else:
114
			else:
117
				self.join_disabled=1
115
				self.join_disabled=1
118
				self.elements[7].disable()
116
				self.elements[7].disable()
119
				self.elements[9].disable()
117
				self.elements[9].disable()
120
				self.elements[11].disable()
118
				self.elements[11].disable()
121
				self.elements[13].disable()
122
			self.draw()
119
			self.draw()
123
		elif key in [ 10, 32 ] and self.elements[4].active:
120
		elif key in [ 10, 32 ] and self.elements[4].active:
124
			self.elements[self.current].key_event(key)
121
			self.elements[self.current].key_event(key)
 Lines 138-144   class object(content): Link Here 
138
135
139
		global JOINTEST_RETVAL
136
		global JOINTEST_RETVAL
140
137
141
		if self.elements[7].disabled and self.elements[9].disabled and self.elements[11].disabled and self.elements[13].disabled:
138
		if self.elements[7].disabled and self.elements[9].disabled and self.elements[11].disabled:
142
			return 0
139
			return 0
143
140
144
		message=_('The following value is missing: ')
141
		message=_('The following value is missing: ')
 Lines 148-157   class object(content): Link Here 
148
			return message+_('Join account')
145
			return message+_('Join account')
149
		elif self.elements[11].result().strip() == '':
146
		elif self.elements[11].result().strip() == '':
150
			return message+_('Password for Root')
147
			return message+_('Password for Root')
151
		elif self.elements[13].result().strip() == '':
152
			return message+_('Password for Root (retype)')
153
		elif self.elements[11].result().strip() != self.elements[13].result().strip():
154
			return _('Passwords did not match.')
155
148
156
		# test join credentials
149
		# test join credentials
157
		data = {}
150
		data = {}
 Lines 188-194   class object(content): Link Here 
188
181
189
	def result(self):
182
	def result(self):
190
		result={}
183
		result={}
191
		if self.elements[7].disabled and self.elements[9].disabled and self.elements[11].disabled and self.elements[13].disabled:
184
		if self.elements[7].disabled and self.elements[9].disabled and self.elements[11].disabled:
192
			result['auto_join']='false'
185
			result['auto_join']='false'
193
		else:
186
		else:
194
			if self.elements[7].result():
187
			if self.elements[7].result():

Return to bug 31965