From f658ab7e7e815b6cc577f4f864c50895fbf0ba76 Mon Sep 17 00:00:00 2001
From: Tyler Struyk <tyler.struyk@uwaterloo.ca>
Date: Thu, 25 Feb 2021 13:30:56 -0800
Subject: [PATCH] ISTWMCS-4651: Add 2 forgotten parent calls that add and save
label form element
---
src/Plugin/Layout/Uw2ColumnLayout.php | 5 ++++-
src/Plugin/Layout/Uw3ColumnLayout.php | 5 ++++-
src/Plugin/Layout/Uw4ColumnLayout.php | 5 ++++-
src/Plugin/Layout/Uw5ColumnLayout.php | 5 ++++-
src/Plugin/Layout/UwColumnLayoutBase.php | 6 ++++--
src/Plugin/Layout/UwInvertedLLeftLayout.php | 5 ++++-
src/Plugin/Layout/UwInvertedLRightLayout.php | 5 ++++-
7 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/Plugin/Layout/Uw2ColumnLayout.php b/src/Plugin/Layout/Uw2ColumnLayout.php
index eb491630..c0990ae2 100644
--- a/src/Plugin/Layout/Uw2ColumnLayout.php
+++ b/src/Plugin/Layout/Uw2ColumnLayout.php
@@ -14,6 +14,9 @@ class Uw2ColumnLayout extends UwColumnLayoutBase {
*/
public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
+ // Get Parents configuration form (which by default adds the Admin Label).
+ $form = parent::buildConfigurationForm($form, $form_state);
+
// Get the config for this layout.
$configuration = $this->getConfiguration();
@@ -25,7 +28,7 @@ class Uw2ColumnLayout extends UwColumnLayoutBase {
];
// The form element for the column widths.
- $form['layout_settings']['column_class'] = [
+ $form['column_class'] = [
'#type' => 'select',
'#title' => $this->t('Column widths'),
'#default_value' => !empty($configuration['column_class']) ? $configuration['column_class'] : 'even-split',
diff --git a/src/Plugin/Layout/Uw3ColumnLayout.php b/src/Plugin/Layout/Uw3ColumnLayout.php
index 308cc01f..2f82b91f 100644
--- a/src/Plugin/Layout/Uw3ColumnLayout.php
+++ b/src/Plugin/Layout/Uw3ColumnLayout.php
@@ -14,6 +14,9 @@ class Uw3ColumnLayout extends UwColumnLayoutBase {
*/
public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
+ // Get Parents configuration form (which by default adds the Admin Label).
+ $form = parent::buildConfigurationForm($form, $form_state);
+
// Get the config for this layout.
$configuration = $this->getConfiguration();
@@ -28,7 +31,7 @@ class Uw3ColumnLayout extends UwColumnLayoutBase {
];
// The form element for the column widths.
- $form['layout_settings']['column_class'] = [
+ $form['column_class'] = [
'#type' => 'select',
'#title' => $this->t('Column widths'),
'#default_value' => !empty($configuration['column_class']) ? $configuration['column_class'] : 'even-split',
diff --git a/src/Plugin/Layout/Uw4ColumnLayout.php b/src/Plugin/Layout/Uw4ColumnLayout.php
index c4c655ec..669a7a2b 100644
--- a/src/Plugin/Layout/Uw4ColumnLayout.php
+++ b/src/Plugin/Layout/Uw4ColumnLayout.php
@@ -14,6 +14,9 @@ class Uw4ColumnLayout extends UwColumnLayoutBase {
*/
public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
+ // Get Parents configuration form (which by default adds the Admin Label).
+ $form = parent::buildConfigurationForm($form, $form_state);
+
// Get the config for this layout.
$configuration = $this->getConfiguration();
@@ -28,7 +31,7 @@ class Uw4ColumnLayout extends UwColumnLayoutBase {
];
// The form element for the column widths.
- $form['layout_settings']['column_class'] = [
+ $form['column_class'] = [
'#type' => 'select',
'#title' => $this->t('Column widths'),
'#default_value' => !empty($configuration['column_class']) ? $configuration['column_class'] : 'even-split',
diff --git a/src/Plugin/Layout/Uw5ColumnLayout.php b/src/Plugin/Layout/Uw5ColumnLayout.php
index 9a64acc1..d75e2b0d 100644
--- a/src/Plugin/Layout/Uw5ColumnLayout.php
+++ b/src/Plugin/Layout/Uw5ColumnLayout.php
@@ -14,6 +14,9 @@ class Uw5ColumnLayout extends UwColumnLayoutBase {
*/
public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
+ // Get Parents configuration form (which by default adds the Admin Label).
+ $form = parent::buildConfigurationForm($form, $form_state);
+
// Get the config for this layout.
$configuration = $this->getConfiguration();
@@ -29,7 +32,7 @@ class Uw5ColumnLayout extends UwColumnLayoutBase {
];
// The form element for the column widths.
- $form['layout_settings']['column_class'] = [
+ $form['column_class'] = [
'#type' => 'select',
'#title' => $this->t('Column widths'),
'#default_value' => !empty($configuration['column_class']) ? $configuration['column_class'] : 'even-split',
diff --git a/src/Plugin/Layout/UwColumnLayoutBase.php b/src/Plugin/Layout/UwColumnLayoutBase.php
index 06460ba4..00864181 100644
--- a/src/Plugin/Layout/UwColumnLayoutBase.php
+++ b/src/Plugin/Layout/UwColumnLayoutBase.php
@@ -16,9 +16,12 @@ class UwColumnLayoutBase extends LayoutDefault implements PluginFormInterface {
*/
public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
+ // Call parent and let it do its thing (like set the label).
+ parent::submitConfigurationForm($form, $form_state);
+
// Set the column class in the config.
$this->configuration['column_class'] = $form_state->getValue(
- ['layout_settings', 'column_class'],
+ ['column_class'],
NULL
);
}
@@ -39,5 +42,4 @@ class UwColumnLayoutBase extends LayoutDefault implements PluginFormInterface {
return $build;
}
-
}
diff --git a/src/Plugin/Layout/UwInvertedLLeftLayout.php b/src/Plugin/Layout/UwInvertedLLeftLayout.php
index 2f3d4c91..3e8281d9 100644
--- a/src/Plugin/Layout/UwInvertedLLeftLayout.php
+++ b/src/Plugin/Layout/UwInvertedLLeftLayout.php
@@ -14,6 +14,9 @@ class UwInvertedLLeftLayout extends UwColumnLayoutBase {
*/
public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
+ // Get Parents configuration form (which by default adds the Admin Label).
+ $form = parent::buildConfigurationForm($form, $form_state);
+
// Get the config for this layout.
$configuration = $this->getConfiguration();
@@ -25,7 +28,7 @@ class UwInvertedLLeftLayout extends UwColumnLayoutBase {
];
// The form element for the column widths.
- $form['layout_settings']['column_class'] = [
+ $form['column_class'] = [
'#type' => 'select',
'#title' => $this->t('Column widths for top row'),
'#default_value' => !empty($configuration['column_class']) ? $configuration['column_class'] : 'even-split',
diff --git a/src/Plugin/Layout/UwInvertedLRightLayout.php b/src/Plugin/Layout/UwInvertedLRightLayout.php
index e0bd1f7a..2bceb312 100644
--- a/src/Plugin/Layout/UwInvertedLRightLayout.php
+++ b/src/Plugin/Layout/UwInvertedLRightLayout.php
@@ -14,6 +14,9 @@ class UwInvertedLRightLayout extends UwColumnLayoutBase {
*/
public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
+ // Get Parents configuration form (which by default adds the Admin Label).
+ $form = parent::buildConfigurationForm($form, $form_state);
+
// Get the config for this layout.
$configuration = $this->getConfiguration();
@@ -25,7 +28,7 @@ class UwInvertedLRightLayout extends UwColumnLayoutBase {
];
// The form element for the column widths.
- $form['layout_settings']['column_class'] = [
+ $form['column_class'] = [
'#type' => 'select',
'#title' => $this->t('Column widths for top row'),
'#default_value' => !empty($configuration['column_class']) ? $configuration['column_class'] : 'even-split',
--
GitLab