Merged in bugfix/SHIBUI-1002 (pull request #260)

SHIBUI-1002: Fixed bugs related to filesystemMetadataProvider; Approved-by: Ryan Mathis <rmathis@unicon.net>
TIER · Dec 11, 2018 · e56efaa · e56efaa
2 parents de6a5ef + 4cb61ba
commit e56efaa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/backend/src/main/resources/file-system-metadata-provider.schema.json b/backend/src/main/resources/file-system-metadata-provider.schema.json
@@ -8,7 +8,7 @@
     ],
     "properties": {
         "name": {
-            "title": "label.metadata-provider-name",
+            "title": "label.service-provider-name-dashboard-display-only",
             "description": "tooltip.metadata-provider-name",
             "type": "string",
             "widget": {
@@ -135,7 +135,7 @@
                     },
                     "placeholder": "label.real-number",
                     "minimum": 0,
-                    "maximum": 1,
+                    "maximum": 0.99,
                     "default": null
                 }
             }

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
@@ -299,7 +299,7 @@ label.metadata-provider-type=Metadata Provider Type
 label.metadata-provider-name=Metadata Provider Name
 label.select-metadata-type=Select a metadata provider type
 label.metadata-provider-status=Metadata Provider Status
-label.enable-provider-upon-saving=Enable Metadata Provider?
+label.enable-provider-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP
 label.certificate-type=Type
 
 label.metadata-file=Metadata File

diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
@@ -299,7 +299,7 @@ label.metadata-provider-type=Metadata Provider Type
 label.metadata-provider-name=Metadata Provider Name
 label.select-metadata-type=Select a metadata provider type
 label.metadata-provider-status=Metadata Provider Status
-label.enable-provider-upon-saving=Enable Metadata Provider?
+label.enable-provider-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP
 label.certificate-type=Type
 
 label.metadata-file=Metadata File

diff --git a/ui/src/app/metadata/provider/model/file-system.provider.form.ts b/ui/src/app/metadata/provider/model/file-system.provider.form.ts
@@ -44,8 +44,8 @@ export const FileSystemMetadataProviderWizard: Wizard<FileSystemMetadataProvider
             ]
         },
         {
-            id: 'reloading',
-            label: 'label.reloading-attributes',
+            id: 'dynamic',
+            label: 'label.dynamic-attributes',
             index: 3,
             initialValues: [],
             schema: '/api/ui/MetadataResolver/FilesystemMetadataResolver',
@@ -116,14 +116,14 @@ export const FileSystemMetadataProviderEditor: Wizard<FileSystemMetadataProvider
                     class: ['mb-3'],
                     fields: [
                         'name',
-                        '@type',
-                        'enabled'
+                        '@type'
                     ]
                 },
                 {
                     type: 'group-lg',
                     class: ['col-12'],
                     fields: [
+                        'enabled',
                         'xmlId',
                         'metadataFile',
                         'doInitialization'
@@ -132,8 +132,8 @@ export const FileSystemMetadataProviderEditor: Wizard<FileSystemMetadataProvider
             ]
         },
         {
-            id: 'reloading',
-            label: 'label.reloading-attributes',
+            id: 'dynamic',
+            label: 'label.dynamic-attributes',
             index: 2,
             initialValues: [],
             schema: '/api/ui/MetadataResolver/FilesystemMetadataResolver',