Merge pull request #43 from hypercision/roleApprover

Add roleNeededForApprover to shared settings configmap

Author: tylervz

charts/thub/Chart.yaml

@@ -6,7 +6,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.7.5
+version: 1.7.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/thub/templates/shared-settings-configmap.yaml

@@ -25,6 +25,9 @@ data:
   hclabs.ojt.blockAllTiles: {{ .Values.ojtBlockAllTiles | quote }}
   hclabs.ojt.requireTotalHours: {{ .Values.ojtRequireTotalHours | quote }}
   hclabs.onlySeeOjtsInYourOrganization: {{ .Values.onlySeeOjtsInYourOrganization | quote }}
+  {{- if .Values.roleNeededForApprover}}
+  hclabs.roleNeededForApprover: {{ .Values.roleNeededForApprover | quote }}
+  {{- end }}
   hclabs.sfLearningHistoryConnectorTimeZone: {{ .Values.sfLearningHistoryConnectorTimeZone | quote }}
   hclabs.sfLearningHistoryEsUserName: {{ .Values.sfLearningHistoryEsUserName | quote }}
   hclabs.sfLearningHistoryLastUpdatedUser: {{ .Values.sfLearningHistoryLastUpdatedUser | quote }}

charts/thub/values.yaml

@@ -48,6 +48,9 @@ ojtRequireTotalHours: true
 # This includes users who have a `null` `organizationID`; they can only see learners who also do not belong to an organization.
 # However, if this is `true` and your user has `ROLE_OJT_FULL_ORG_VISIBILITY`, then you can see all the learners and OJTs.
 onlySeeOjtsInYourOrganization: false
+# Specify role here to override the default defined by the OJT application.yml
+# In order for a Learner/User to be an approver for an OJT or OJTCourse, they need to have this specified role.
+roleNeededForApprover: ""
 # The timezone that SuccessFactors expects date and time values to be in the learning history connector input file.
 # It is in a format that can be used by `java.util.TimeZone.getTimeZone()`. This value can be different for each client.
 sfLearningHistoryConnectorTimeZone: "GMT"