Skip to content
GitLab
Commit 747932f6 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch '5681-the-opsi-plugin-need-the-departement-management-dropdown' into '1.3-dev' 

Resolve "the opsi plugin need the departement management dropdown"

Closes #5681

See merge request !22
parents 7d2b620d 2a6079de
dev 6104-mail-methods-refactor 6231-give-the-ability-to-the-webservice-to-notice-if-an-attribute-is-monovalued-or-multivalued 6237-add-requiredattrs-array-to-the-webservice-informations 6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines 6250-supann-configuration-backend-requires-account-life-cycle-section 6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure 6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id 6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5 6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2 6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases 6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user 6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 2 deletions
+4 -2
opsi/admin/opsi/class_opsiProfile.inc
+ 1
− 0
View file @ 747932f6
...@@ -85,6 +85,7 @@ class opsiProfile extends simplePlugin ...@@ -85,6 +85,7 @@ class opsiProfile extends simplePlugin
'main' => array( 'main' => array(
'name' => _('Name'), 'name' => _('Name'),
'attrs' => array( 'attrs' => array(
new BaseSelectorAttribute(get_ou('opsiRDN')),
new SubmittingOPSIServerAttribute( new SubmittingOPSIServerAttribute(
_('OPSI server'), _('OPSI server to use for deployment'), _('OPSI server'), _('OPSI server to use for deployment'),
'fdOpsiServerDN', TRUE 'fdOpsiServerDN', TRUE
......
opsi/admin/opsi/class_opsiProfileManagement.inc
+ 2
− 2
View file @ 747932f6
...@@ -22,9 +22,9 @@ class opsiManagement extends simpleManagement ...@@ -22,9 +22,9 @@ class opsiManagement extends simpleManagement
{ {
protected $objectTypes = array('opsiProfile', 'opsiSoftwareList'); protected $objectTypes = array('opsiProfile', 'opsiSoftwareList');
protected $departmentBrowser = FALSE; protected $departmentBrowser = TRUE;
protected $departmentRootVisible = FALSE; protected $departmentRootVisible = FALSE;
protected $baseMode = FALSE; protected $baseMode = TRUE;
/* Return plugin information for acl handling */ /* Return plugin information for acl handling */
static function plInfo() static function plInfo()
......
opsi/admin/opsi/class_opsiSoftwareList.inc
+ 1
− 0
View file @ 747932f6
...@@ -50,6 +50,7 @@ class opsiSoftwareList extends simplePlugin ...@@ -50,6 +50,7 @@ class opsiSoftwareList extends simplePlugin
'main' => array( 'main' => array(
'name' => _('Infos'), 'name' => _('Infos'),
'attrs' => array( 'attrs' => array(
new BaseSelectorAttribute(get_ou('opsiRDN')),
new SubmittingOPSIServerAttribute( new SubmittingOPSIServerAttribute(
_('OPSI server'), _('OPSI server to use for deployment'), _('OPSI server'), _('OPSI server to use for deployment'),
'fdOpsiServerDN', TRUE 'fdOpsiServerDN', TRUE
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment