Merge branch 'SHIBUI-905' into SHIBUI-906

TIER · Oct 22, 2018 · 9cf4343 · 9cf4343
2 parents 49e8d71 + ec5791f
commit 9cf4343
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/...nternet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy b/...nternet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy
@@ -33,7 +33,7 @@ class MetadataSourcesUiDefinitionController {
     ResponseEntity<?> getUiDefinitionJsonSchema() {
         try {
             def parsedJson = jacksonObjectMapper.readValue(this.jsonSchemaLocation.url, Map)
-            addReleaseAttributesToJson(parsedJson["properties"]["attributeRelease"]["widget"])
+            addReleaseAttributesToJson(parsedJson['properties']['attributeRelease']['widget'])
             addRelyingPartyOverridesToJson(parsedJson["properties"]["relyingPartyOverrides"])
             addRelyingPartyOverridesCollectionDefinitions(parsedJson["definitions"])
             return ResponseEntity.ok(parsedJson)
@@ -47,14 +47,9 @@ class MetadataSourcesUiDefinitionController {
     }
 
     private void addReleaseAttributesToJson(Object json) {
-        def data = []
-        customPropertiesConfiguration.getAttributes().each {
-            def attribute = [:]
-            attribute["key"] = it["name"]
-            attribute["label"] = it["displayName"]
-            data << attribute
+        json['data'] = customPropertiesConfiguration.getAttributes().collect {
+            ['key': it['name'], 'label': it['displayName']]
         }
-        json["data"] = data
     }
 
     private void addRelyingPartyOverridesToJson(Object json) {

diff --git 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