Attachment #8932 for bug #1567

(-)a/management/univention-directory-manager-modules/modules/univention/admin/__init__.py (-1 / +3 lines)

Lines 198-204 def __init__(	Link Here

198

		include_in_default_search=False,

198

		include_in_default_search=False,

199

		nonempty_is_default=False,

199

		nonempty_is_default=False,

200

		readonly_when_synced=False,

200

		readonly_when_synced=False,

201

		size=None):

201

		size=None,

202

		copyable=False):

202

203

		self.short_description = short_description

204

		self.short_description = short_description

204

		self.long_description = long_description

205

		self.long_description = long_description

Lines 228-233 def __init__(	Link Here

228

		self.nonempty_is_default = nonempty_is_default

229

		self.nonempty_is_default = nonempty_is_default

229

		self.readonly_when_synced = readonly_when_synced

230

		self.readonly_when_synced = readonly_when_synced

230

		self.size = size

231

		self.size = size

232

		self.copyable = copyable

231

233

232

	def new(self):

234

	def new(self):

233

		if self.multivalue:

235

		if self.multivalue:




_ = translation.translate

module = 'groups/group'
operations = ['add', 'edit', 'remove', 'search', 'move', 'copy']
childs = 0
short_description = _('Group')
long_description = ''

		may_change=True,
		identifies=False,
		default=('2', []),
		options=['samba'],
		copyable=True,
	),
	'sambaPrivileges': univention.admin.property(
		short_description=_('Samba privilege'),

		dontsearch=False,
		may_change=True,
		identifies=False,
		copyable=True,
	),
	'adGroupType': univention.admin.property(
		short_description=_('AD group type'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'description': univention.admin.property(
		short_description=_('Description'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'users': univention.admin.property(
		short_description=_('Users'),

		dontsearch=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'hosts': univention.admin.property(
		short_description=_('Hosts'),

		dontsearch=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'mailAddress': univention.admin.property(
		short_description=_('Mail address'),

		dontsearch=False,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'memberOf': univention.admin.property(
		short_description=_('Member of'),

		dontsearch=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'nestedGroup': univention.admin.property(
		short_description=_('Groups'),

		dontsearch=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'allowedEmailUsers': univention.admin.property(
		short_description=_('Users that are allowed to send e-mails to the group'),

		may_change=True,
		dontsearch=True,
		identifies=False,
		copyable=True,
	),
	'allowedEmailGroups': univention.admin.property(
		short_description=_('Groups that are allowed to send e-mails to the group'),

		may_change=True,
		dontsearch=True,
		identifies=False,
		copyable=True,
	)
}


(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/extended_attribute.py (+13 lines)

Lines 367-372	Link Here

367

		may_change=True,

367

		may_change=True,

368

		identifies=False

368

		identifies=False

369

),

369

),

370

	'copyable': univention.admin.property(

371

		short_description=_('Copyable'),

372

		long_description=_('Values of this extended attribute are automatically filled into the form when copying a object.'),

373

		syntax=univention.admin.syntax.boolean,

374

		multivalue=False,

375

		options=[],

376

		required=False,

377

		may_change=True,

378

		identifies=False,

379

		copyable=True,

380

),

370

381

371

382

372

layout = [

383

layout = [

Lines 418-423	Link Here

418

		["valueRequired"],

429

		["valueRequired"],

419

		["mayChange"],

430

		["mayChange"],

420

		["notEditable"],

431

		["notEditable"],

432

		["copyable"],

421

]),

433

]),

422

434

423

435

Lines 446-451	Link Here

446

mapping.register('valueRequired', 'univentionUDMPropertyValueRequired', None, univention.admin.mapping.ListToString)

458

mapping.register('valueRequired', 'univentionUDMPropertyValueRequired', None, univention.admin.mapping.ListToString)

447

mapping.register('notEditable', 'univentionUDMPropertyValueNotEditable', None, univention.admin.mapping.ListToString)

459

mapping.register('notEditable', 'univentionUDMPropertyValueNotEditable', None, univention.admin.mapping.ListToString)

448

mapping.register('doNotSearch', 'univentionUDMPropertyDoNotSearch', None, univention.admin.mapping.ListToString)

460

mapping.register('doNotSearch', 'univentionUDMPropertyDoNotSearch', None, univention.admin.mapping.ListToString)

461

mapping.register('copyable', 'univentionUDMPropertyCopyable', None, univention.admin.mapping.ListToString)

449

mapping.register('version', 'univentionUDMPropertyVersion', None, univention.admin.mapping.ListToString)

462

mapping.register('version', 'univentionUDMPropertyVersion', None, univention.admin.mapping.ListToString)

450

mapping.register('CLIName', 'univentionUDMPropertyCLIName', None, univention.admin.mapping.ListToString)

463

mapping.register('CLIName', 'univentionUDMPropertyCLIName', None, univention.admin.mapping.ListToString)

451

mapping.register('options', 'univentionUDMPropertyOptions')

464

mapping.register('options', 'univentionUDMPropertyOptions')






module = 'users/user'
operations = ['add', 'edit', 'remove', 'search', 'move', 'copy']
template = 'settings/usertemplate'
uid_umlauts_mixedcase = 0


		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'lastname': univention.admin.property(
		short_description=_('Last name'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'gecos': univention.admin.property(
		short_description=_('GECOS'),

		may_change=True,
		default='<firstname> <lastname><:umlauts,strip>',
		identifies=False,
		dontsearch=True,
		copyable=True,
	),
	'displayName': univention.admin.property(
		short_description=_('Display name'),

		default='<firstname> <lastname><:strip>',
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'title': univention.admin.property(
		short_description=_('Title'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'sambaPrivileges': univention.admin.property(
		short_description=_('Samba privilege'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'description': univention.admin.property(
		short_description=_('Description'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'organisation': univention.admin.property(
		short_description=_('Organisation'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'userexpiry': univention.admin.property(
		short_description=_('Account expiry date'),

		may_change=True,
		dontsearch=True,
		identifies=False,
		copyable=True,
	),
	'passwordexpiry': univention.admin.property(
		short_description=_('Password expiry date'),

		dontsearch=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'pwdChangeNextLogin': univention.admin.property(
		short_description=_('Change password on next login'),

		required=False,
		may_change=True,
		identifies=False,
		show_in_lists=True,
		copyable=True,
	),
	'locked': univention.admin.property(
		short_description=_('Locked login methods'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'e-mail': univention.admin.property(
		short_description=_('E-mail address'),

		required=False,
		may_change=True,
		identifies=False,
		default=['<mailPrimaryAddress>'],
		copyable=True,
	),
	'postcode': univention.admin.property(
		short_description=_('Postal code'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'city': univention.admin.property(
		short_description=_('City'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'country': univention.admin.property(
		short_description=_('Country'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'phone': univention.admin.property(
		short_description=_('Telephone number'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'employeeNumber': univention.admin.property(
		short_description=_('Employee number'),

		required=False,
		may_change=True,
		identifies=False,
		copyable=True,
	),
	'roomNumber': univention.admin.property(
		short_description=_('Room number'),

		required=False,
		may_change=True,
		identifies=False,
		copyable=True,
	),
	'secretary': univention.admin.property(
		short_description=_('Superior'),

		required=False,
		may_change=True,
		identifies=False,
		copyable=True,
	),
	'departmentNumber': univention.admin.property(
		short_description=_('Department number'),

		required=False,
		may_change=True,
		identifies=False,
		copyable=True,
	),
	'employeeType': univention.admin.property(
		short_description=_('Employee type'),

		required=False,
		may_change=True,
		identifies=False,
		copyable=True,
	),
	'homePostalAddress': univention.admin.property(
		short_description=_('Private postal address'),

		required=False,
		may_change=True,
		identifies=False,
		copyable=True,
	),
	'homeTelephoneNumber': univention.admin.property(
		short_description=_('Private telephone number'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'mobileTelephoneNumber': univention.admin.property(
		short_description=_('Mobile phone number'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'pagerTelephoneNumber': univention.admin.property(
		short_description=_('Pager telephone number'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'birthday': univention.admin.property(
		short_description=_('Birthdate'),

		required=False,
		may_change=True,
		identifies=False,
		copyable=True,
	),
	'unixhome': univention.admin.property(
		short_description=_('Unix home directory'),

		required=False,
		may_change=True,
		identifies=False,
		default='/bin/bash',
		copyable=True,
	),
	'sambahome': univention.admin.property(
		short_description=_('Windows home path'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'scriptpath': univention.admin.property(
		short_description=_('Windows logon script'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'profilepath': univention.admin.property(
		short_description=_('Windows profile directory'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'homedrive': univention.admin.property(
		short_description=_('Windows home drive'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'sambaRID': univention.admin.property(
		short_description=_('Relative ID'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'primaryGroup': univention.admin.property(
		short_description=_('Primary group'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'mailHomeServer': univention.admin.property(
		short_description=_('Mail home server'),

		dontsearch=False,
		may_change=True,
		identifies=False,
		copyable=True,
	),
	'mailPrimaryAddress': univention.admin.property(
		short_description=_('Primary e-mail address'),

		may_change=True,
		identifies=False,
		readonly_when_synced=False,
		copyable=True,
	),
	'mailForwardAddress': univention.admin.property(
		short_description=_('Forward e-mail address'),

		may_change=True,
		identifies=False,
		readonly_when_synced=False,
		copyable=True,
	),
	'mailForwardCopyToSelf': univention.admin.property(
		short_description=_('Forwarding setting'),

		may_change=True,
		identifies=False,
		readonly_when_synced=False,
		copyable=True,
	),
	'overridePWHistory': univention.admin.property(
		short_description=_('Override password history'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'overridePWLength': univention.admin.property(
		short_description=_('Override password check'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'homeShare': univention.admin.property(
		short_description=_('Home share'),

		dontsearch=True,
		may_change=True,
		identifies=False,
		copyable=True,
	),
	'homeSharePath': univention.admin.property(
		short_description=_('Home share path'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'sambaLogonHours': univention.admin.property(
		short_description=_('Permitted times for Windows logins'),

		may_change=True,
		identifies=False,
		readonly_when_synced=True,
		copyable=True,
	),
	'jpegPhoto': univention.admin.property(
		short_description=_("Picture of the user (JPEG format)"),

		may_change=True,
		options=['person'],
		identifies=False,
		copyable=True,
	),
	'userCertificate': univention.admin.property(
		short_description=_("PKI user certificate (DER format)"),

		may_change=True,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateIssuerCountry': univention.admin.property(
		short_description=_('Issuer Country'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateIssuerState': univention.admin.property(
		short_description=_('Issuer State'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateIssuerLocation': univention.admin.property(
		short_description=_('Issuer Location'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateIssuerOrganisation': univention.admin.property(
		short_description=_('Issuer Organisation'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateIssuerOrganisationalUnit': univention.admin.property(
		short_description=_('Issuer Organisational Unit'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateIssuerCommonName': univention.admin.property(
		short_description=_('Issuer Common Name'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateIssuerMail': univention.admin.property(
		short_description=_('Issuer Mail'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateSubjectCountry': univention.admin.property(
		short_description=_('Subject Country'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateSubjectState': univention.admin.property(
		short_description=_('Subject State'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateSubjectLocation': univention.admin.property(
		short_description=_('Subject Location'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateSubjectOrganisation': univention.admin.property(
		short_description=_('Subject Organisation'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateSubjectOrganisationalUnit': univention.admin.property(
		short_description=_('Subject Organisational Unit'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateSubjectCommonName': univention.admin.property(
		short_description=_('Subject Common Name'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateSubjectMail': univention.admin.property(
		short_description=_('Subject Mail'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateDateNotBefore': univention.admin.property(
		short_description=_('Valid from'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateDateNotAfter': univention.admin.property(
		short_description=_('Valid until'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateVersion': univention.admin.property(
		short_description=_('Version'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'certificateSerial': univention.admin.property(
		short_description=_('Serial'),

		editable=False,
		options=['pki'],
		identifies=False,
		copyable=True,
	),
	'umcProperty': univention.admin.property(
		short_description=_('UMC user preferences'),

		required=False,
		may_change=True,
		identifies=False,
		copyable=True,
	),
}


(-)a/management/univention-directory-manager-modules/modules/univention/admin/modules.py (-1 / +4 lines)

Lines 312-317 def update_extended_attributes(lo, module, position):	Link Here

312

		# value is editable (only via hooks or direkt module.info[] access)

312

		# value is editable (only via hooks or direkt module.info[] access)

313

		editable = attrs.get('univentionUDMPropertyValueNotEditable', ['0'])[0] not in ['1', 'TRUE']

313

		editable = attrs.get('univentionUDMPropertyValueNotEditable', ['0'])[0] not in ['1', 'TRUE']

314

315

		copyable = attrs.get('univentionUDMPropertyCopyable', ['0'])[0] not in ['1', 'TRUE']

316

315

		# value is required

317

		# value is required

316

		valueRequired = (attrs.get('univentionUDMPropertyValueRequired', ['0'])[0].upper() in ['1', 'TRUE'])

318

		valueRequired = (attrs.get('univentionUDMPropertyValueRequired', ['0'])[0].upper() in ['1', 'TRUE'])

317

319

Lines 368-374 def update_extended_attributes(lo, module, position):	Link Here

368

			dontsearch=doNotSearch,

370

			dontsearch=doNotSearch,

369

			identifies=False,

371

			identifies=False,

370

			default=propertyDefault,

372

			default=propertyDefault,

371

			editable=editable

373

			editable=editable,

374

			copyable=copyable,

372

375

373

376

374

		# add LDAP mapping

377

		# add LDAP mapping

(-)a/management/univention-ldap/schema/custom-attribute.schema (-1 / +9 lines)

Lines 285-290 attributetype ( 1.3.6.1.4.1.10176.200.130 NAME 'univentionUDMPropertyLayoutDisab	Link Here

285

        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE)

285

        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE)

286

287

288

attributetype ( 1.3.6.1.4.1.10176.200.131 NAME 'univentionUDMPropertyCopyable'

289

        DESC 'defines if this attribute is copyable in UMC'

290

        EQUALITY caseIgnoreMatch

291

		SUBSTR caseIgnoreSubstringsMatch

292

        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE)

293

294

288

objectclass ( 1.3.6.1.4.1.10176.200.199

295

objectclass ( 1.3.6.1.4.1.10176.200.199

289

    NAME 'univentionUDMProperty'

296

    NAME 'univentionUDMProperty'

290

        DESC ' defines a custom attribute for use in univention directory manager '

297

        DESC ' defines a custom attribute for use in univention directory manager '

Lines 319-325 objectclass ( 1.3.6.1.4.1.10176.200.199	Link Here

319

			  univentionUDMPropertyLayoutGroupName $

326

			  univentionUDMPropertyLayoutGroupName $

320

			  univentionUDMPropertyTranslationGroupName $

327

			  univentionUDMPropertyTranslationGroupName $

321

			  univentionUDMPropertyLayoutGroupPosition $

328

			  univentionUDMPropertyLayoutGroupPosition $

322

			  univentionUDMPropertyLayoutDisable

329

			  univentionUDMPropertyLayoutDisable $

330

			  univentionUDMPropertyCopyable

323

331

324

332

325

333

(-)a/management/univention-ldap/scripts/ldap_setup_index (+2 lines)

Lines 251-256 UDM_PROP_ATTRS = set((	Link Here

251

    'univentionUDMPropertyValueMayChange',

251

    'univentionUDMPropertyValueMayChange',

252

    'univentionUDMPropertyValueRequired',

252

    'univentionUDMPropertyValueRequired',

253

    'univentionUDMPropertyVersion',

253

    'univentionUDMPropertyVersion',

254

    'univentionUDMPropertyCopyable',

254

))

255

))

255

256

RECOMMENDED_LDAP_INDEX = {

257

RECOMMENDED_LDAP_INDEX = {

Lines 364-369 RECOMMENDED_LDAP_INDEX = {	Link Here

364

        'univentionUDMPropertyLongDescription',

365

        'univentionUDMPropertyLongDescription',

365

        'univentionUDMPropertyShortDescription',

366

        'univentionUDMPropertyShortDescription',

366

        'zoneName',

367

        'zoneName',

368

        'univentionUDMPropertyCopyable',

367

)),

369

)),

368

    'approx': set((

370

    'approx': set((

369

        'cn',

371

        'cn',





			// check whether we need to open directly the detail page of a given or a new object
			if (this.openObject) {
				this._loadUCRVariables().then(lang.hitch(this, 'createDetailPage', 'edit',
					this.openObject.objectType, this.openObject.objectDN, undefined, true, this.openObject.note)
				);
				return; // do not render the search page
			}
			if (this.newObject) {
				this._loadUCRVariables().then(lang.hitch(this, 'createDetailPage', 'add',
					this.newObject.objectType, undefined, this.newObject, true, this.newObject.note)
				);
				return; // do not render the search page

					var objType = state.shift();
					var ldapName = state.length > 1 ? state : state[0];
					this._loadUCRVariables().then(lang.hitch(this, function() {
						this.createDetailPage('edit', objType, ldapName);
					}));
				}
				this._set('moduleState', _state);

				canExecute: lang.hitch(this, '_canEdit'),
				callback: lang.hitch(this, function(ids, items) {
					if (items.length == 1 && items[0].objectType) {
						this.createDetailPage('edit', items[0].objectType, ids[0]);
					} else if (items.length >= 1 && items[0].objectType) {
						// make sure that all objects do have the same type
						var sameType = true;

						}

						// everything ok, load detail page
						this.createDetailPage('edit', items[0].objectType, ids);
					}
				})
			}, {

				callback: lang.hitch(this, function(ids, objects) {
					this.moveObjects(objects);
				})
			}, {
				name: 'copy',
				label: _('Copy'),
				description: _('Create a copy of the LDAP object.'),
				isMultiAction: false,
				canExecute: lang.hitch(this, '_canCopy'),
				callback: lang.hitch(this, function(ids, items) {
					this._showNewObjectDialog({
						args: {
							wizardsDisabled: true,
							defaultObjectType: items[0].objectType,
							showObjectType: false,
							showObjectTemplate: false
						},
						callback: lang.hitch(this, function(options) {
							this.createDetailPage('copy', items[0].objectType, ids[0], options);
						})
					});
				})
			}];

			if ('navigation' !== this.moduleFlavor && this._reports.length) {

				label: _('Edit'),
				iconClass: 'umcIconEdit',
				onClick: lang.hitch(this, function() {
					this.createDetailPage('edit', this._navContextItem.objectType, this._navContextItem.id);
				})
			}));
			menu.addChild(this._menuDelete = new MenuItem({

			return item.$operations$.indexOf('move') !== -1;
		},

		_canCopy: function(item) {
			return item.$operations$.indexOf('copy') !== -1;
		},

		_canDelete: function(item) {
			if (tools.isTrue(this._ucr['ad/member'])) {
				return -1 === array.indexOf(item.$flags$, 'synced');

		},

		showNewObjectDialog: function() {
			this._showNewObjectDialog({
				args: {},
				callback: lang.hitch(this, function(options) {
					this.createDetailPage('add', options.objectType, undefined, options);
				})
			});
		},

		_showNewObjectDialog: function(args) {
			// summary:
			//		Open a user dialog for creating a new LDAP object.



			// open the dialog
			var onHandlerRegistered = new Deferred();
			this._newObjectDialog = new NewObjectDialog(lang.mixin({
				addNotification: lang.hitch(this, 'addNotification'),
				umcpCommand: lang.hitch(this, 'umcpCommand'),
				wizardsDisabled: tools.isTrue(this._wizardsDisabled),

				selectedContainer: selectedContainer,
				selectedSuperordinate: superordinate,
				defaultObjectType: this._ucr['directory/manager/web/modules/' + this.moduleFlavor + '/add/default'] || null
			}, args.args));
			this._newObjectDialog.on('FirstPageFinished', args.callback);
				this.createDetailPage(options.objectType, undefined, options);
			}));
			this._newObjectDialog.on('Done', lang.hitch(this, function() {
				if (this._newObjectDialog) {
					this._newObjectDialog.destroyRecursive();

			}

			this._setDetailPage(
				'edit',
				this._preloadedObjectType,
				this._ldapNameDeferred,
				/*newObjectOptions*/ null,

			);
		},

		_setDetailPage: function(operation, objectType, ldapName, newObjOptions, /*Boolean*/ isClosable, /*String*/ note) {
			this._destroyDetailPage();
			var cssClass = this.moduleFlavor == 'users/user' ? 'umcUDMUsersModule' : '';
			this._detailPage = new DetailPage({

				moduleStore: this.moduleStore,
				moduleFlavor: this.moduleFlavor,
				objectType: objectType,
				operation: operation,
				ldapBase: this._ucr['ldap/base'],
				ldapName: ldapName,
				newObjectOptions: newObjOptions,

			}
		},

		createDetailPage: function(operation, objectType, ldapName, newObjOptions, /*Boolean?*/ isClosable, /*String?*/ note) {
			// summary:
			//		Creates and views the detail page for editing LDAP objects if it doesn't exists. Afterwards it opens the detailpage.
			if (!this._ldapNameDeferred) {
				this._preloadDetailPage(operation);
			}
			if (operation === 'copy') {
				this._setDetailPage(operation, objectType, ldapName, newObjOptions, isClosable, note);
				this._ldapNameDeferred.resolve(ldapName);
			} else if (this._detailPage && this._preloadedObjectType == this.moduleFlavor && ldapName && !(ldapName instanceof Array)) {
				// use pre-rendered detail page when loading a (single) object
				this._ldapNameDeferred.resolve(ldapName);
			} else {
				this._setDetailPage(operation, objectType, ldapName, newObjOptions, isClosable, note);
				this._ldapNameDeferred.resolve(null);
			}


(-)a/management/univention-management-console-module-udm/umc/js/udm/DetailPage.js (-25 / +45 lines)

Lines 26-32	Link Here

 * /usr/share/common-licenses/AGPL-3; if not, see

 * /usr/share/common-licenses/AGPL-3; if not, see

 * <http://www.gnu.org/licenses/>.

 * <http://www.gnu.org/licenses/>.

*/

*/

/*global require,define,setTimeout,dijit,window,console*/

/*global require,define,setTimeout,window,console*/

define([

define([

	"dojo/_base/declare",

	"dojo/_base/declare",

Lines 101-106 define([	Link Here

101

		//		Flavor of the module

101

		//		Flavor of the module

102

		moduleFlavor: this.moduleFlavor,

102

		moduleFlavor: this.moduleFlavor,

103

104

		// operation: String

105

		// 		One of 'add', 'edit', 'copy'

106

		operation: null,

107

104

		// objectType: String

108

		// objectType: String

105

		//		The object type of the LDAP object that is edited.

109

		//		The object type of the LDAP object that is edited.

106

		objectType: null,

110

		objectType: null,

Lines 278-284 define([	Link Here

278

282

279

283

280

			return all({

284

			return all({

281

				object: this.moduleStore.get(this.ldapName),

285

				object: this.getObject(this.ldapName),

282

				formBuilt: formBuiltDeferred

286

				formBuilt: formBuiltDeferred

283

			}).then(lang.hitch(this, function(result) {

287

			}).then(lang.hitch(this, function(result) {

284

				// save the original data we received from the server

288

				// save the original data we received from the server

Lines 304-323 define([	Link Here

304

					}, this);

308

					}, this);

305

				}));

309

				}));

306

310

307

				// var objecttype = vals.$labelObjectType$;

311

				if (this.operation === 'add') {  // don't show when copying objects

308

				var path = tools.ldapDn2Path( this.ldapName, this.ldapBase);

312

					// var objecttype = vals.$labelObjectType$;

309

				var objecttype = _('Type: <i>%(type)s</i>', { type: vals.$labelObjectType$ });

313

					var path = tools.ldapDn2Path( this.ldapName, this.ldapBase);

310

				var position = _('Position: <i>%(path)s</i>', { path: path });

314

					var objecttype = _('Type: <i>%(type)s</i>', { type: vals.$labelObjectType$ });

311

				var position_text = lang.replace('{0}<br>{1}', [objecttype, position]);

315

					var position = _('Position: <i>%(path)s</i>', { path: path });

312

				array.forEach(this._tabs.getChildren(), lang.hitch(this, function(child) {

316

					var position_text = lang.replace('{0}<br>{1}', [objecttype, position]);

313

					if (child.position_text) {

317

					array.forEach(this._tabs.getChildren(), lang.hitch(this, function(child) {

314

						child.position_text.set('content', position_text);

318

						if (child.position_text) {

315

319

							child.position_text.set('content', position_text);

316

				}));

320

321

					}));

322

317

				return this._form.ready();

323

				return this._form.ready();

318

			}));

324

			}));

319

},

325

},

320

326

327

		getObject: function(dn) {

328

			if (this.operation === 'copy') {

329

				return this.umcpCommand('udm/copy', [dn], undefined, this.moduleFlavor).then(function(response) {

330

					return response.result[0];

331

});

332

333

			return this.moduleStore.get(dn);

334

},

335

321

		ready: function() {

336

		ready: function() {

322

			return this._pageRenderedDeferred;

337

			return this._pageRenderedDeferred;

323

},

338

},

Lines 364-370 define([	Link Here

364

},

379

},

365

380

366

		_notifyAboutAutomaticChanges: function() {

381

		_notifyAboutAutomaticChanges: function() {

367

			if (!this.ldapName || this._multiEdit) {

382

			if (this.operation === 'add' || this.operation === 'copy' || this._multiEdit) {

368

				// ignore creation of a new object as well as the multi edit mode

383

				// ignore creation of a new object as well as the multi edit mode

369

				return;

384

				return;

370

385

Lines 427-432 define([	Link Here

427

						this._policyDeferred.resolve();

442

						this._policyDeferred.resolve();

428

					}));

443

					}));

429

				}));

444

				}));

445

				if (this.operation === 'copy') {

446

					this._loadPolicies(policies).then(lang.hitch(this, function() {

447

						this._policyDeferred.resolve();

448

					}));

449

430

			} else {

450

			} else {

431

				// in case there are no policies, we use a dummy Deferred object

451

				// in case there are no policies, we use a dummy Deferred object

432

				this._policyDeferred.resolve();

452

				this._policyDeferred.resolve();

Lines 554-560 define([	Link Here

554

					}, this);

574

					}, this);

555

575

556

					// make sure that the widget use the flavored umcpCommand

576

					// make sure that the widget use the flavored umcpCommand

557

					array.forEach( newProperties, function( iprop) {

577

					array.forEach(newProperties, function(iprop) {

558

						iprop.umcpCommand = this.umcpCommand;

578

						iprop.umcpCommand = this.umcpCommand;

559

					}, this);

579

					}, this);

560

580

Lines 654-664 define([	Link Here

654

674

655

675

656

				// handle editable items

676

				// handle editable items

657

				if ( iprop.readonly) {

677

				if (iprop.readonly) {

658

					iprop.disabled = true;

678

					iprop.disabled = true;

659

				} else {

679

				} else {

660

					if (iprop.disabled !== true) {

680

					if (iprop.disabled !== true) {

661

						iprop.disabled = this.ldapName === undefined ? false : ! iprop.editable;

681

						iprop.disabled = this.operation === 'add' ? false : ! iprop.editable;

662

682

663

683

664

				if (this._multiEdit && iprop.identifies) {

684

				if (this._multiEdit && iprop.identifies) {

Lines 754-761 define([	Link Here

754

			// the following checks are only necessary for the AD member mode

774

			// the following checks are only necessary for the AD member mode

755

			when(this.ldapName, lang.hitch(this, function(ldapName){

775

			when(this.ldapName, lang.hitch(this, function(ldapName){

756

				this.ldapName = ldapName;

776

				this.ldapName = ldapName;

757

				if (!ldapName) {

777

				if (!ldapName || this.operation === 'copy') {

758

					// new object / multiEdit...

778

					// new object / multiEdit / copy...

759

					deferred.resolve(properties);

779

					deferred.resolve(properties);

760

					return;

780

					return;

761

781

Lines 821-827 define([	Link Here

821

				return text;

841

				return text;

822

});

842

});

823

843

824

			if (!this.active_directory_enabled() || !this.ldapName || !this.isSyncedObject) {

844

			if (!this.active_directory_enabled() || this.operation === 'add' || !this.isSyncedObject) {

825

				return;

845

				return;

826

846

827

			var value = '';

847

			var value = '';

Lines 852-858 define([	Link Here

852

},

872

},

853

873

854

		_prepareOptions: function(properties, layout, template, formBuiltDeferred) {

874

		_prepareOptions: function(properties, layout, template, formBuiltDeferred) {

855

			var isNewObject = !this.ldapName;

875

			var isNewObject = this.operation === 'add';

856

876

857

			var _getOptionProperty = function(properties) {

877

			var _getOptionProperty = function(properties) {

858

				var result = array.filter(properties, function(item) {

878

				var result = array.filter(properties, function(item) {

Lines 1142-1148 define([	Link Here

1142

},

1162

},

1143

1163

1144

		buildTemplate: function(_template, properties, widgets) {

1164

		buildTemplate: function(_template, properties, widgets) {

1145

			if (this.ldapName || this._multiEdit) {

1165

			if (this.operation !== 'add' || this._multiEdit) {

1146

				return;

1166

				return;

1147

1167

1148

1168

Lines 1214-1220 define([	Link Here

1214

});

1234

});

1215

1235

1216

			var createLabel = '';

1236

			var createLabel = '';

1217

			if (this.newObjectOptions) {

1237

			if (this.operation === 'add' || this.operation === 'copy') {

1218

				createLabel = _createLabelText();

1238

				createLabel = _createLabelText();

1219

			} else {

1239

			} else {

1220

				createLabel = _('Save');

1240

				createLabel = _('Save');

Lines 1731-1737 define([	Link Here

1731

							this.moduleStore.put(ivals);

1751

							this.moduleStore.put(ivals);

1732

						}, this);

1752

						}, this);

1733

						deferred = transaction.commit();

1753

						deferred = transaction.commit();

1734

					} else if (this.newObjectOptions) {

1754

					} else if (this.operation === 'add' || this.operation === 'copy') {

1735

						deferred = this.moduleStore.add(vals, this.newObjectOptions);

1755

						deferred = this.moduleStore.add(vals, this.newObjectOptions);

1736

					} else {

1756

					} else {

1737

						deferred = this.moduleStore.put(vals);

1757

						deferred = this.moduleStore.put(vals);

Lines 1885-1891 define([	Link Here

1885

						newVals[iname] = iwidget.get('value');

1905

						newVals[iname] = iwidget.get('value');

1886

1906

1887

				}));

1907

				}));

1888

			} else if (this.newObjectOptions) {

1908

			} else if (this.operation === 'add' || this.operation === 'copy') {

1889

				// get only non-empty values or values of type 'boolean'

1909

				// get only non-empty values or values of type 'boolean'

1890

				tools.forIn(vals, lang.hitch(this, function(iname, ival) {

1910

				tools.forIn(vals, lang.hitch(this, function(iname, ival) {

1891

					if (typeof(ival) == 'boolean' || (!(ival instanceof Array && !ival.length) && ival)) {

1911

					if (typeof(ival) == 'boolean' || (!(ival instanceof Array && !ival.length) && ival)) {

Lines 1919-1925 define([	Link Here

1919

		confirmClose: function() {

1939

		confirmClose: function() {

1920

			topic.publish('/umc/actions', 'udm', this._parentModule.moduleFlavor, 'edit', 'cancel');

1940

			topic.publish('/umc/actions', 'udm', this._parentModule.moduleFlavor, 'edit', 'cancel');

1921

1941

1922

			if (!this.newObjectOptions && this.haveVisibleValuesChanged()) {

1942

			if (this.operation === 'edit' && this.haveVisibleValuesChanged()) {

1923

				return dialog.confirm(_('There are unsaved changes. Are you sure to cancel?'), [{

1943

				return dialog.confirm(_('There are unsaved changes. Are you sure to cancel?'), [{

1924

					label: _('Continue editing'),

1944

					label: _('Continue editing'),

1925

					name: 'cancel'

1945

					name: 'cancel'

(-)a/management/univention-management-console-module-udm/umc/js/udm/NewObjectDialog.js (-1 / +6 lines)

Lines 74-79 define([	Link Here

		//		The object type that is selected by default.

		//		The object type that is selected by default.

		defaultObjectType: null,

		defaultObjectType: null,

		showObjectType: true,

		showObjectTemplate: true,

		autofocus: false, // interferes with Wizard.autoFocus

		autofocus: false, // interferes with Wizard.autoFocus

		_notificationText: null,

		_notificationText: null,

Lines 148-154 define([	Link Here

148

				moduleFlavor: this.moduleFlavor,

151

				moduleFlavor: this.moduleFlavor,

149

				umcpCommand: this.umcpCommand,

152

				umcpCommand: this.umcpCommand,

150

				selectedContainer: this.selectedContainer,

153

				selectedContainer: this.selectedContainer,

151

				selectedSuperordinate: this.selectedSuperordinate

154

				selectedSuperordinate: this.selectedSuperordinate,

155

				showObjectTemplate: this.showObjectTemplate,

156

				showObjectType: this.showObjectType

152

});

157

});

153

158

154

			this._preWizard.canContinue().then(lang.hitch(this, function() {

159

			this._preWizard.canContinue().then(lang.hitch(this, function() {

(-)a/management/univention-management-console-module-udm/umc/js/udm/wizards/FirstPageWizard.js (-2 / +11 lines)

Lines 48-53 define([	Link Here

		_canContinue: null, // deferred which indicates if any of the pages in this wizard should be displayed or not

		_canContinue: null, // deferred which indicates if any of the pages in this wizard should be displayed or not

		showObjectType: true,

		showObjectTemplate: true,

		postMixInProperties: function() {

		postMixInProperties: function() {

			this.inherited(arguments);

			this.inherited(arguments);

			this._canContinue = new Deferred();

			this._canContinue = new Deferred();

Lines 388-393 define([	Link Here

388

				label: _('Type'),

391

				label: _('Type'),

389

				description: _('The exact object type of the new LDAP object.'),

392

				description: _('The exact object type of the new LDAP object.'),

390

				autoHide: true,

393

				autoHide: true,

394

				visible: this.showObjectType,

391

				depends: selectedContainer ? [] : ['container'/*, 'superordinate'*/],

395

				depends: selectedContainer ? [] : ['container'/*, 'superordinate'*/],

392

				dynamicValues: lang.hitch(this, function() {

396

				dynamicValues: lang.hitch(this, function() {

393

					var containerWidget = this.getWidget('firstPage', 'container');

397

					var containerWidget = this.getWidget('firstPage', 'container');

Lines 404-410 define([	Link Here

404

}),

408

}),

405

				size: 'Two'

409

				size: 'Two'

406

});

410

});

407

			layout.push('objectType');

411

			if (this.showObjectType) {

412

				layout.push('objectType');

413

408

414

409

			// templates

415

			// templates

410

			widgets.push({

416

			widgets.push({

Lines 415-420 define([	Link Here

415

				value: this.defaultTemplate,

421

				value: this.defaultTemplate,

416

				depends: 'objectType',

422

				depends: 'objectType',

417

				autoHide: true,

423

				autoHide: true,

424

				visible: this.showObjectTemplate,

418

				umcpCommand: this.umcpCommand,

425

				umcpCommand: this.umcpCommand,

419

				dynamicValues: lang.hitch(this, function(options) {

426

				dynamicValues: lang.hitch(this, function(options) {

420

					return this.moduleCache.getTemplates(options.objectType).then(function(result) {

427

					return this.moduleCache.getTemplates(options.objectType).then(function(result) {

Lines 425-431 define([	Link Here

425

				staticValues: [{id: 'None', label: _('None')}],

432

				staticValues: [{id: 'None', label: _('None')}],

426

				size: 'Two'

433

				size: 'Two'

427

});

434

});

428

			layout.push('objectTemplate');

435

			if (this.showObjectTemplate) {

436

				layout.push('objectTemplate');

437

429

438

430

			if (this.moduleFlavor === 'navigation') {

439

			if (this.moduleFlavor === 'navigation') {

431

				layout = ['container', 'container_help', 'objectType', 'objectTemplate'];

440

				layout = ['container', 'container_help', 'objectType', 'objectTemplate'];




		return: [ { '$dn$' : <LDAP DN>, <object properties> }, ... ]
		"""

		def _thread(request):
			result = []
			for ldap_dn in request.options:
				if request.flavor == 'users/self':
					ldap_dn = self._user_dn
				module = get_module(request.flavor, ldap_dn)
				if module is None:
					raise ObjectDoesNotExist(ldap_dn)
				else:
					obj = module.get(ldap_dn)
					if obj:
						obj.set_defaults = True
						for name, p in obj.descriptions.items():
							if obj.has_key(name) and obj.descriptions[name].default(obj):  # noqa: W601
								obj[name]  # __getitem__ sets default value
						props = obj.info
						for passwd in module.password_properties:
							if passwd in props:
								del props[passwd]
						props['$dn$'] = obj.dn
						props['$options$'] = {}
						for opt in module.get_options(udm_object=obj):
							props['$options$'][opt['id']] = opt['value']
						props['$policies$'] = {}
						for policy in obj.policies:
							pol_mod = get_module(None, policy)
							if pol_mod and pol_mod.name:
								props['$policies$'].setdefault(pol_mod.name, []).append(policy)
						props['$labelObjectType$'] = module.title
						props['$flags$'] = obj.oldattr.get('univentionObjectFlag', [])
						props['$operations$'] = module.operations
						props['$references$'] = module.get_references(ldap_dn)
						result.append(props)
					else:
						MODULE.process('The LDAP object for the LDAP DN %s could not be found' % ldap_dn)
			return result

		MODULE.info('Starting thread for udm/get request')
		thread = notifier.threads.Simple('Get', notifier.Callback(self._get, request), notifier.Callback(self.thread_finished_callback, request))
		thread.run()

	def copy(self, request):
		thread = notifier.threads.Simple('Copy', notifier.Callback(self._get, request, True), notifier.Callback(self.thread_finished_callback, request))
		thread.run()

	def _get(self, request, copy=False):
		result = []
		for ldap_dn in request.options:
			if request.flavor == 'users/self':
				ldap_dn = self._user_dn
			module = get_module(request.flavor, ldap_dn)
			if module is None:
				raise ObjectDoesNotExist(ldap_dn)
			else:
				obj = module.get(ldap_dn)
				if obj:
					if copy:
						for name, p in obj.descriptions.items():
							if not p.copyable:
								obj.info.pop(name, None)
					obj.set_defaults = True
					for name, p in obj.descriptions.items():
						if obj.has_key(name) and obj.descriptions[name].default(obj):  # noqa: W601
							obj[name]  # __getitem__ sets default value
					props = obj.info
					for passwd in module.password_properties:
						if passwd in props:
							del props[passwd]
					if not copy:
						props['$dn$'] = obj.dn
					props['$options$'] = {}
					for opt in module.get_options(udm_object=obj):
						props['$options$'][opt['id']] = opt['value']
					props['$policies$'] = {}
					for policy in obj.policies:
						pol_mod = get_module(None, policy)
						if pol_mod and pol_mod.name:
							props['$policies$'].setdefault(pol_mod.name, []).append(policy)
					props['$labelObjectType$'] = module.title
					props['$flags$'] = obj.oldattr.get('univentionObjectFlag', [])
					props['$operations$'] = module.operations
					props['$references$'] = module.get_references(ldap_dn)
					result.append(props)
				else:
					MODULE.process('The LDAP object for the LDAP DN %s could not be found' % ldap_dn)
		return result

	@sanitize(
		objectPropertyValue=LDAPSearchSanitizer(
			add_asterisks=ADD_ASTERISKS,

(-)a/management/univention-management-console-module-udm/umc/udm.xml (+1 lines)

Lines 116-121	Link Here

116

		<command name="udm/add" function="add" />

116

		<command name="udm/add" function="add" />

117

		<command name="udm/remove" function="remove" />

117

		<command name="udm/remove" function="remove" />

118

		<command name="udm/get" function="get" />

118

		<command name="udm/get" function="get" />

119

		<command name="udm/copy" function="copy" />

119

		<command name="udm/move" function="move" />

120

		<command name="udm/move" function="move" />

120

		<command name="udm/progress" function="progress" />

121

		<command name="udm/progress" function="progress" />

121

		<command name="udm/validate" function="validate" />

122

		<command name="udm/validate" function="validate" />

Return to bug 1567