Fix loginpage_links feature.

thijskh · thijskh · commit e4bb90bd0b6f · 2023-03-01T14:37:26.000+01:00
It seems with the addition of twig templates another way to process these links (or other links) has been started but which is broken. The original way still remains in the code. Make it clearer which links this concerns by making the template variable more explicit and remove the unused tabs code. Closes: #1770
diff --git a/modules/core/src/Controller/Login.php b/modules/core/src/Controller/Login.php
@@ -291,7 +291,7 @@ private function handleLogin(Request $request, $source, array $state): Template
                 $t->data['organizations'] = $organizations;
             }
         } else {
-            $t->data['links'] = $source->getLoginLinks();
+            $t->data['loginpage_links'] = $source->getLoginLinks();
         }
 
         $t->data['errorcode'] = $errorCode;
diff --git a/modules/core/templates/base.twig b/modules/core/templates/base.twig
@@ -3,23 +3,6 @@
 
 <div id="portalmenu" class="ui-tabs ui-widget ui-widget-content ui-corner-all">
 
-    <ul class="tabset_tabs ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
-
-    {% if links is defined %}
-    {% for name, link in links %}
-    {% if name == pageid %}
-        <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active">
-            <a href="#">{{ link.text|trans }}</a>
-        </li>
-    {% else %}
-        <li class="ui-state-default ui-corner-top">
-            <a href="{{ link.href }}">{{ link.text|trans }}</a>
-        </li>
-    {% endif %}
-    {% endfor %}
-    {% endif %}
-
-    </ul>
     <div id="portalcontent" class="ui-tabs-panel ui-widget-content ui-corner-bottom">
 
 {{ block('content') }}
diff --git a/modules/core/templates/loginuserpass.twig b/modules/core/templates/loginuserpass.twig
@@ -110,9 +110,9 @@
             </div>
         </form>
     </div>
-    {% if links is defined -%}
+    {% if loginpage_links is defined -%}
     <ul>
-        {% for link in links -%}
+        {% for link in loginpage_links -%}
         <li><a href="{{ link.href }}">{{ link['text']|trans }}</a></li>
         {% endfor %}
     </ul>

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ private function handleLogin(Request $request, $source, array $state): Template`
`291`	`291`	`$t->data['organizations'] = $organizations;`
`292`	`292`	`}`
`293`	`293`	`} else {`
`294`		`- $t->data['links'] = $source->getLoginLinks();`
	`294`	`+ $t->data['loginpage_links'] = $source->getLoginLinks();`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`$t->data['errorcode'] = $errorCode;`