Skip to content
Snippets Groups Projects
Commit df18a7e9 authored by Sebastian Kehr's avatar Sebastian Kehr :rowboat_tone2:
Browse files

Merge branch 'instance/fid' into instance/fid_adlr

parents 2d937414 1ce5fa62
No related merge requests found
......@@ -16,6 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* @author Sebastian Kehr <kehr@ub.uni-leipzig.de>
* @author Gregor Gawol <gawol@ub.uni-leipzig.de>
* @author Alexander Purr <purr@ub.uni-leipzig.de>
* @license http://opensource.org/licenses/gpl-2.0.php GNU GPLv2
*/
......@@ -25,7 +27,10 @@ class UserCreateFormInputFilter extends RootAwareBaseInputFilter
{
public function getValues()
{
$permissions = ['basic_access' => 'granted'];
$permissions = [
'basic_access' => 'granted',
'limited_access' => 'granted'
];
return compact('permissions') + parent::getValues();
}
}
\ No newline at end of file
......@@ -129,13 +129,17 @@ $elemHomeLibrary->setAttributes(['class' => 'form-control']);
<?php
/** @var Element\Radio $elemJobTitle */
$elemJobTitle = $form->get('job_title');
$elemJobTitle->setLabelAttributes(['class' => 'col-md-4']);
$elemJobTitle->setAttributes(['class' => 'form-control']);
?>
<div class="form-group">
<?= $this->formLabel($elemJobTitle) ?>
<?= $this->formSelect($elemJobTitle) ?>
<?= $this->formElementErrors($elemJobTitle) ?>
<div class="form-group row">
<div class="col-md-12">
<div class="col-md-4">
<?= $this->formLabel($elemJobTitle)?>
</div>
<div class="col-md-8 row">
<?= $this->formElement($elemJobTitle)?>
</div>
<?= $this->formElementErrors($elemJobTitle)?>
</div>
</div>
<? /* Permissions */ ?>
......@@ -155,7 +159,6 @@ foreach ($permissions as $permission) {
}
?>
<h3><?= $this->formLabel($elemPermissions) ?></h3>
<?php foreach ($elements ?? [] as $element): ?>
<div class="form-group">
<?= $this->formLabel($element) ?>
......@@ -163,7 +166,6 @@ foreach ($permissions as $permission) {
</div>
<?php endforeach; ?>
<? /* addresses */ ?>
<?= $this->render('fid/user/address-collection.phtml') ?>
......
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