From fa6a127378ca21de5f6e369cd55b5c19e58a3af6 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Mon, 22 Oct 2018 09:13:45 -0700
Subject: [PATCH 1/3] SHIBUI-905 Removed brand specific text from
 messages.properties

---
 backend/src/main/resources/i18n/messages_en.properties | 4 ----
 ui/src/app/app.component.html                          | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
index 2661b1fae..83b644910 100644
--- a/backend/src/main/resources/i18n/messages_en.properties
+++ b/backend/src/main/resources/i18n/messages_en.properties
@@ -89,10 +89,6 @@ brand.footer.links-label-4=Mailing List
 brand.footer.links-desc-4=Shibboleth.net open-source community mailing list
 brand.footer.copyright=Copyright \u00A9 Internet2
 
-brand.unicon=Unicon
-brand.unicon-logo=Unicon Logo
-brand.i2=Internet 2
-brand.i2-logo=Internet 2 Logo
 brand.in-partnership-with=In partnership with
 brand.and=and
 
diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
index cd56856e3..f09ae298a 100644
--- a/ui/src/app/app.component.html
+++ b/ui/src/app/app.component.html
@@ -85,12 +85,12 @@
         <div class="col-md-6 logo">
             <div class="d-flex align-items-end justify-content-end p-2">
                 <translate-i18n key="brand.in-partnership-with" class="flex-item mr-2">In partnership with</translate-i18n>&nbsp;
-                <a href="https://www.unicon.net" target="_blank" title="brand.unicon" class="flex-item">
-                    <img src="/assets/logo_unicon.png" class="img-fluid float-right" [alt]="'brand.unicon-logo' | translate">
+                <a href="https://www.unicon.net" target="_blank" title="Unicon" class="flex-item">
+                    <img src="/assets/logo_unicon.png" class="img-fluid float-right" alt="Unicon Logo">
                 </a>
                 &nbsp;<translate-i18n key="brand.and" class="flex-item mx-2">and</translate-i18n>&nbsp;
-                <a href="https://www.internet2.edu/" target="_blank" title="brand.i2" class="flex-item">
-                    <img src="/assets/logo_internet2.png" class="img-fluid float-right" [alt]="'brand.i2-logo' | translate">
+                <a href="https://www.internet2.edu/" target="_blank" title="Internet 2" class="flex-item">
+                    <img src="/assets/logo_internet2.png" class="img-fluid float-right" alt="Internet 2 Logo">
                 </a>
             </div>
         </div>

From 92183a556d1a4406b27fe8dac4350629da9a8a4e Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Mon, 22 Oct 2018 11:15:52 -0700
Subject: [PATCH 2/3] SHIBUI-905 updated root file as well

---
 backend/src/main/resources/i18n/messages.properties | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 2661b1fae..83b644910 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -89,10 +89,6 @@ brand.footer.links-label-4=Mailing List
 brand.footer.links-desc-4=Shibboleth.net open-source community mailing list
 brand.footer.copyright=Copyright \u00A9 Internet2
 
-brand.unicon=Unicon
-brand.unicon-logo=Unicon Logo
-brand.i2=Internet 2
-brand.i2-logo=Internet 2 Logo
 brand.in-partnership-with=In partnership with
 brand.and=and
 

From 8d6a4339f7f66e631f24da00294d09f2aefa7eeb Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Mon, 22 Oct 2018 11:28:47 -0700
Subject: [PATCH 3/3] [SHIBUI-905]

A little Groovy cleanup.
---
 .../MetadataSourcesUiDefinitionController.groovy      | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy
index 9d54e5ac0..aeedd07e7 100644
--- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy
+++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy
@@ -38,15 +38,10 @@ class MetadataSourcesUiDefinitionController {
     ResponseEntity<?> getUiDefinitionJsonSchema() {
         try {
             def parsedJson = jacksonObjectMapper.readValue(this.jsonSchemaLocation.url, Map)
-            def widget = parsedJson["properties"]["attributeRelease"]["widget"]
-            def data = []
-            customAttributesConfiguration.getAttributes().each {
-                def attribute = [:]
-                attribute["key"] = it["name"]
-                attribute["label"] = it["displayName"]
-                data << attribute
+            parsedJson['properties']['attributeRelease']['widget']['data'] =
+                    customAttributesConfiguration.getAttributes().collect {
+                [key: it['name'], label: it['displayName']]
             }
-            widget["data"] = data
             return ResponseEntity.ok(parsedJson)
         }
         catch (Exception e) {