Skip to content
Snippets Groups Projects
Commit e3729a62 authored by Murtaza Sultani's avatar Murtaza Sultani Committed by Moritz Strohm
Browse files

Resolve "Undefined variablen Warnungen beim Resource hinzufügen"

Closes #4423

Merge request studip/studip!3219
parent f3046f9a
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ class Resources_ResourceController extends AuthenticatedController ...@@ -27,7 +27,7 @@ class Resources_ResourceController extends AuthenticatedController
$this->edit_global_permissions = false; $this->edit_global_permissions = false;
$this->resource_id_parameter = $args[0]; $this->resource_id_parameter = $args[0] ?? null;
$this->resources = []; $this->resources = [];
$this->resource_ids = []; $this->resource_ids = [];
...@@ -215,7 +215,7 @@ class Resources_ResourceController extends AuthenticatedController ...@@ -215,7 +215,7 @@ class Resources_ResourceController extends AuthenticatedController
protected function addEditDeleteHandler($mode = 'add') protected function addEditDeleteHandler($mode = 'add')
{ {
$this->resource = $this->resources[0]; $this->resource = $this->resources[0] ?? null;
$user = User::findCurrent(); $user = User::findCurrent();
$this->show_form = false; $this->show_form = false;
...@@ -282,10 +282,11 @@ class Resources_ResourceController extends AuthenticatedController ...@@ -282,10 +282,11 @@ class Resources_ResourceController extends AuthenticatedController
CSRFProtection::verifyUnsafeRequest(); CSRFProtection::verifyUnsafeRequest();
if (($mode == 'add') || ($mode == 'edit')) { if (($mode == 'add') || ($mode == 'edit')) {
//Process submitted form: //Process submitted form:
$this->parent_id = $this->resource->parent_id;
if ($mode == 'add') { if ($mode == 'add') {
$this->category_id = Request::get('category_id'); $this->category_id = Request::get('category_id');
$this->parent_id = Request::get('parent_id', ''); $this->parent_id = Request::get('parent_id', '');
} else {
$this->parent_id = $this->resource->parent_id;
} }
$this->name = Request::get('name'); $this->name = Request::get('name');
$this->description = Request::get('description'); $this->description = Request::get('description');
......
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
<legend><?= _('Grunddaten') ?></legend> <legend><?= _('Grunddaten') ?></legend>
<label> <label>
<?= _('Name') ?> <?= _('Name') ?>
<input type="text" name="name" value="<?= htmlReady($name) ?>"> <input type="text" name="name" value="<?= !empty($name) ? htmlReady($name) : '' ?>">
</label> </label>
<label> <label>
<?= _('Beschreibungstext') ?> <?= _('Beschreibungstext') ?>
<input type="text" name="description" value="<?= htmlReady($description) ?>"> <input type="text" name="description" value="<?= !empty($description) ? htmlReady($description) : '' ?>">
</label> </label>
<? if ($GLOBALS['perm']->have_perm('root')): ?> <? if ($GLOBALS['perm']->have_perm('root')): ?>
<label> <label>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<label> <label>
<?= _('Sortierposition') ?> <?= _('Sortierposition') ?>
<input type="text" name="sort_position" <input type="text" name="sort_position"
value="<?= htmlReady($sort_position) ?>"> value="<?= !empty($sort_position) ? htmlReady($sort_position) : '' ?>">
</label> </label>
<? endif ?> <? endif ?>
</fieldset> </fieldset>
......
...@@ -249,7 +249,8 @@ class ResourceCategory extends SimpleORMap ...@@ -249,7 +249,8 @@ class ResourceCategory extends SimpleORMap
]; ];
$property_groups = []; $property_groups = [];
foreach ($definitions as $definition) { foreach ($definitions as $definition) {
if ($definition->group->name) {
if (!empty($definition->group->name)) {
$group_name = $definition->group->name; $group_name = $definition->group->name;
if (!is_array($property_groups[$group_name])) { if (!is_array($property_groups[$group_name])) {
$property_groups[$group_name] = []; $property_groups[$group_name] = [];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment