Attachment #3542 for bug #23746

(-)management/univention-directory-manager-modules/modules/univention/admin/handlers/groups/group.py (+27 lines)

Lines 109-114	Link Here

109

			default=('2',[]),

109

			default=('2',[]),

110

			options=['samba']

110

			options=['samba']

111

),

111

),

112

	'sambaPrivileges': univention.admin.property(

113

			short_description=_('Samba privileges'),

114

			long_description=('Manage samba privileges'),

115

			syntax=univention.admin.syntax.sambaPrivileges,

116

			multivalue=1,

117

			options=['samba'],

118

			required=0,

119

			dontsearch=0,

120

			may_change=1,

121

			identifies=0,

122

),

112

	'description': univention.admin.property(

123

	'description': univention.admin.property(

113

			short_description=_('Description'),

124

			short_description=_('Description'),

114

			long_description='',

125

			long_description='',

Lines 222-227	Link Here

222

	], advanced = True ),

233

	], advanced = True ),

223

	univention.admin.tab(_('Allowed groups'),_('Groups that are allowed to send e-mails to the group'),[

234

	univention.admin.tab(_('Allowed groups'),_('Groups that are allowed to send e-mails to the group'),[

224

		[univention.admin.field("allowedEmailGroups")]

235

		[univention.admin.field("allowedEmailGroups")]

236

	], advanced = True ),

237

	univention.admin.tab(_('Windows'),_('Windows account settings'),[

238

		[univention.admin.field("sambaPrivileges")]

225

	], advanced = True )

239

	], advanced = True )

226

240

227

241

Lines 231-236	Link Here

231

mapping.register('description', 'description', None, univention.admin.mapping.ListToString)

245

mapping.register('description', 'description', None, univention.admin.mapping.ListToString)

232

mapping.register('sambaGroupType', 'sambaGroupType', None, univention.admin.mapping.ListToString)

246

mapping.register('sambaGroupType', 'sambaGroupType', None, univention.admin.mapping.ListToString)

233

mapping.register('mailAddress', 'mailPrimaryAddress', None, univention.admin.mapping.ListToString)

247

mapping.register('mailAddress', 'mailPrimaryAddress', None, univention.admin.mapping.ListToString)

248

mapping.register('sambaPrivileges', 'univentionSambaPrivilegeList')

234

249

235

def _case_insensitive_in_list(dn, list):

250

def _case_insensitive_in_list(dn, list):

236

	for element in list:

251

	for element in list:

Lines 569-574	Link Here

569

	def _ldap_modlist( self ):

584

	def _ldap_modlist( self ):

570

585

571

		ml=univention.admin.handlers.simpleLdap._ldap_modlist( self )

586

		ml=univention.admin.handlers.simpleLdap._ldap_modlist( self )

587

588

		# samba privileges

589

		if self.hasChanged("sambaPrivileges") and "samba" in self.options:

590

			o = self.oldattr.get('objectClass', [])

591

			# add univentionSambaPrivileges objectclass

592

			if self["sambaPrivileges"] and not "univentionSambaPrivileges" in o:

593

				ml.insert(0, ('objectClass', '', 'univentionSambaPrivileges'))

594

			# do not remove univentionSambaPrivileges objectclass

595

			# (we need it in the listener filter)

596

			#if not self["sambaPrivileges"] and "univentionSambaPrivileges" in o:

597

			#	ml.insert(0, ('objectClass', 'univentionSambaPrivileges', ''))

598

572

		if self.hasChanged( 'mailAddress' ) and self[ 'mailAddress' ]:

599

		if self.hasChanged( 'mailAddress' ) and self[ 'mailAddress' ]:

573

			for i, j in self.alloc:

600

			for i, j in self.alloc:

574

				if i == 'mailPrimaryAddress': break

601

				if i == 'mailPrimaryAddress': break

(-)management/univention-directory-manager-modules/modules/univention/admin/handlers/users/de.po (+8 lines)

Lines 286-291	Link Here

286

msgid "Groups"

286

msgid "Groups"

287

msgstr "Gruppen"

287

msgstr "Gruppen"

288

289

#: user.py:528

290

msgid "Samba privileges"

291

msgstr "Samba Privilegien"

292

293

#: user.py:529

294

msgid "Manage samba privileges"

295

msgstr "Samba Privilegien verwalten"

296

289

#: user.py:538

297

#: user.py:538

290

msgid "Primary group"

298

msgid "Primary group"

291

msgstr "Primäre Gruppe"

299

msgstr "Primäre Gruppe"

(-)management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py (-2 / +25 lines)

Lines 524-529	Link Here

524

			identifies=0,

524

			identifies=0,

525

			options=['samba']

525

			options=['samba']

526

),

526

),

527

	'sambaPrivileges': univention.admin.property(

528

			short_description=_('Samba privileges'),

529

			long_description=('Manage samba privileges'),

530

			syntax=univention.admin.syntax.sambaPrivileges,

531

			multivalue=1,

532

			options=['samba'],

533

			required=0,

534

			dontsearch=0,

535

			may_change=1,

536

			identifies=0,

537

),

527

	'groups': univention.admin.property(

538

	'groups': univention.admin.property(

528

			short_description=_('Groups'),

539

			short_description=_('Groups'),

529

			long_description='',

540

			long_description='',

Lines 1114-1120	Link Here

1114

	univention.admin.tab(_('Windows'),_('Windows account settings'),[

1125

	univention.admin.tab(_('Windows'),_('Windows account settings'),[

1115

		[univention.admin.field("sambahome"), univention.admin.field("homedrive")],

1126

		[univention.admin.field("sambahome"), univention.admin.field("homedrive")],

1116

		[univention.admin.field("scriptpath"), univention.admin.field("profilepath")],

1127

		[univention.admin.field("scriptpath"), univention.admin.field("profilepath")],

1117

		[univention.admin.field("sambaRID")],

1128

		[univention.admin.field("sambaRID"), univention.admin.field("sambaPrivileges")],

1118

		[univention.admin.field("sambaLogonHours"), univention.admin.field("sambaUserWorkstations")]

1129

		[univention.admin.field("sambaLogonHours"), univention.admin.field("sambaUserWorkstations")]

1119

]),

1130

]),

1120

	univention.admin.tab(_('Groups'),_('Group memberships'), [

1131

	univention.admin.tab(_('Groups'),_('Group memberships'), [

Lines 1380-1386	Link Here

1380

mapping.register('organisation', 'o', None, univention.admin.mapping.ListToString)

1391

mapping.register('organisation', 'o', None, univention.admin.mapping.ListToString)

1381

1392

1382

mapping.register('mailPrimaryAddress', 'mailPrimaryAddress', None, univention.admin.mapping.ListToLowerString)

1393

mapping.register('mailPrimaryAddress', 'mailPrimaryAddress', None, univention.admin.mapping.ListToLowerString)

1383

mapping.register('mailAlternativeAddress', 'mailAlternativeAddress', univention.admin.mapping.ListToLowerListUniq)

1394

mapping.register('mailAlternativeAddress', 'mailAlternativeAddress', None, univention.admin.mapping.ListToLowerListUniq)

1384

mapping.register('mailGlobalSpamFolder', 'mailGlobalSpamFolder', None, univention.admin.mapping.ListToString)

1395

mapping.register('mailGlobalSpamFolder', 'mailGlobalSpamFolder', None, univention.admin.mapping.ListToString)

1385

1396

1386

mapping.register('street', 'street', None, univention.admin.mapping.ListToString)

1397

mapping.register('street', 'street', None, univention.admin.mapping.ListToString)

Lines 1402-1407	Link Here

1402

mapping.register('sambahome', 'sambaHomePath', None, univention.admin.mapping.ListToString)

1413

mapping.register('sambahome', 'sambaHomePath', None, univention.admin.mapping.ListToString)

1403

mapping.register('sambaUserWorkstations', 'sambaUserWorkstations', sambaWorkstationsMap, sambaWorkstationsUnmap)

1414

mapping.register('sambaUserWorkstations', 'sambaUserWorkstations', sambaWorkstationsMap, sambaWorkstationsUnmap)

1404

mapping.register('sambaLogonHours', 'sambaLogonHours', logonHoursMap, logonHoursUnmap)

1415

mapping.register('sambaLogonHours', 'sambaLogonHours', logonHoursMap, logonHoursUnmap)

1416

mapping.register('sambaPrivileges', 'univentionSambaPrivilegeList')

1405

mapping.register('scriptpath', 'sambaLogonScript', None, univention.admin.mapping.ListToString)

1417

mapping.register('scriptpath', 'sambaLogonScript', None, univention.admin.mapping.ListToString)

1406

mapping.register('profilepath', 'sambaProfilePath', None, univention.admin.mapping.ListToString)

1418

mapping.register('profilepath', 'sambaProfilePath', None, univention.admin.mapping.ListToString)

1407

mapping.register('homedrive', 'sambaHomeDrive', None, univention.admin.mapping.ListToString)

1419

mapping.register('homedrive', 'sambaHomeDrive', None, univention.admin.mapping.ListToString)

Lines 2227-2232	Link Here

2227

		shadowLastChangeValue = ''	# if is filled, it will be added to ml in the end

2239

		shadowLastChangeValue = ''	# if is filled, it will be added to ml in the end

2228

		sambaPwdLastSetValue = ''	# if is filled, it will be added to ml in the end

2240

		sambaPwdLastSetValue = ''	# if is filled, it will be added to ml in the end

2229

2241

2242

		# samba privileges

2243

		if self.hasChanged("sambaPrivileges") and "samba" in self.options:

2244

			o = self.oldattr.get('objectClass', [])

2245

			# add univentionSambaPrivileges objectclass

2246

			if self["sambaPrivileges"] and not "univentionSambaPrivileges" in o:

2247

				ml.insert(0, ('objectClass', '', 'univentionSambaPrivileges'))

2248

			# do not remove univentionSambaPrivileges objectclass

2249

			# (we need it in the listener filter)

2250

			#if not self["sambaPrivileges"] and "univentionSambaPrivileges" in o:

2251

			#	ml.insert(0, ('objectClass', 'univentionSambaPrivileges', ''))

2252

2230

		if self.options != self.old_options:

2253

		if self.options != self.old_options:

2231

			univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'options: %s' % self.options)

2254

			univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'options: %s' % self.options)

2232

			univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'old_options: %s' % self.old_options)

2255

			univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'old_options: %s' % self.old_options)




	name='ldapServer'
	def parse(self, text):
		return text

class sambaPrivileges(simple):
	name='sambaPrivileges'
	privileges = [
		{ "name" : "SeMachineAccountPrivilege", "description" : _("Add machines to domain") },
		{ "name" : "SeSecurityPrivilege",       "description" : _("Manage auditing and security log") },
		{ "name" : "SeTakeOwnershipPrivilege",  "description" : _("Take ownership of files or other objects") },
		{ "name" : "SeBackupPrivilege",         "description" : _("Back up files and directories") },
		{ "name" : "SeRestorePrivilege",        "description" : _("Restore files and directories") },
		{ "name" : "SeRemoteShutdownPrivilege", "description" : _("Force shutdown from a remote system") },
		{ "name" : "SePrintOperatorPrivilege",  "description" : _("Manage printers") },
		{ "name" : "SeAddUsersPrivilege",       "description" : _("Add users and groups to the domain") },
		{ "name" : "SeDiskOperatorPrivilege",   "description" : _("Manage disk shares") },
	]
	def parse(self, text):
		return text

class printerServer(simple):
	name='printerServer'
	def parse(self, text):





					################################

					elif property.syntax.name == 'sambaPrivileges':
						self.minput[name]=[]
						minput_rows=[]
						atts=copy.deepcopy(attributes)
						mvaluelist=[]
						i=0
						if value:
							for v in value:
								try:
									mvaluelist.append({'name': unicode(i), 'description': syntax.tostring(v)})
								except univention.admin.uexceptions.valueInvalidSyntax, e:
									pass
								i+=1
						if name:
							# [0]: input field (or several input fields in case of a complex syntax property)

							packages = property.syntax.privileges

							self.minput[name].append(question_select(property.short_description,atts,{'choicelist':packages,'helptext':_('select Server')}))
							atts=copy.deepcopy(attributes)
							b_atts=copy.deepcopy(attributes)
							b2_atts=copy.deepcopy(attributes)
							# [1]: add button
							self.minput[name].append(get_addbutton(b_atts,_("Add %s") % name))
							# [2]: mselect list widget
							self.minput[name].append(question_mselect(_("Entries:"),atts,{"helptext":_("Current entries for '%s'") % name,"choicelist":mvaluelist}))
							# [3]: remove button
							self.minput[name].append(get_removebutton(b_atts,_("Remove selected '%s' entrie(s) from list") % name))

							# move buttons:
							# [4]: up button [ ^ ]
							self.minput[name].append(get_upbutton(b2_atts,_("Move upwards")))
							# [5]: down button [ v ]
							self.minput[name].append(get_downbutton(b2_atts,_("Move downwards")))

							# put the widgets/buttons from minput[name] into a table
							#                 |                |
							#                 |----------------|
							#  <input field>  | <add button>   |
							# ---------------------------------|
							#                 | <up button>    |
							#                 |----------------|
							#                 | <remove button>|
							#  <mselect list> |----------------|
							#                 | <down button>  |
							#----------------------------------|
							minput_rows.append(tablerow("",{},{"obs":[\
										tablecol('',{'rowspan':'2'}, {'obs': [\
											#input field
											self.minput[name][0]\
										]}),\
										tablecol('',{}, {'obs': [\
											# needed freespace
											htmltext("",{},{'htmltext':['&nbsp;']})
										]})\
									]}))
							minput_rows.append(tablerow("",{},{"obs":[\
										tablecol('',{'type':'multi_add_top'}, {'obs': [\
											#add button
											self.minput[name][1]\
										]})\
									]}))
							minput_rows.append(tablerow("",{},{"obs":[\
										tablerow("",{},{"obs":[\
											tablecol('',{'rowspan':'3'}, {'obs': [\
												#mselect list
												self.minput[name][2]\
											]}),\
											tablecol('',{'type':'multi_remove'}, {'obs': [\
												#up button
												self.minput[name][4]\
											]})\
										]}),\
										tablerow("",{},{"obs":[\
											tablecol('',{'type':'multi_remove'}, {'obs': [\
												#remove button
												self.minput[name][3]\
											]})\
										]}),\
										tablerow("",{},{"obs":[\
											tablecol('',{'type':'multi_remove_img'}, {'obs': [\
												#down button
												self.minput[name][5]\
											]})\
										]})\
									]}))
						else:
							minput_rows.append(tablerow("",{},{"obs":[\
										tablecol('',{}, {'obs': [\
										]}),\
										tablecol('',{}, {'obs': [\
										]})\
									]}))
						cols.append(tablecol('',{'type':'tab_layout'}, {'obs': [table("",{'type':'multi'},{"obs":minput_rows})]}))

					

					################################

					elif property.syntax.name == 'ldapServer':
						self.minput[name]=[]
						minput_rows=[]

Return to bug 23746