feat(ui): added custom role map to project, component and release #371
Conversation
| @@ -138,6 +149,38 @@ protected void dealWithStringMap(U field) { | |||
| } | |||
| } | |||
|
|
|||
| protected void dealWithCustomMap(U field) { | |||
| Map<String,Set<String>> updateDocumentMap = (Map<String, Set<String>>) updateDocument.getFieldValue(field); | |||
| if(updateDocumentMap == null) { | |||
There was a problem hiding this comment.
This begs to be a call to CommonUtils.nullToEmptyMap(), doesn't it?
Same for actualDocumentMap.
| @@ -0,0 +1,78 @@ | |||
| /* | |||
| * Copyright (c) Bosch Software Innovations GmbH 2016. | |||
There was a problem hiding this comment.
You may want to extend copyright to year 2017. (Also applies to the two new jsp/jspf files.)
There was a problem hiding this comment.
This code was created 2016.
| @@ -145,8 +146,6 @@ else if (field == Release._Fields.MAINLINE_STATE) | |||
| return getMainlineStatefromString(value); | |||
| else if (field == Project._Fields.STATE) | |||
| return getProjectStateFromString(value); | |||
| else if (field == Project._Fields.CLEARING_STATE) | |||
There was a problem hiding this comment.
You are right. This looks wrong.
| @@ -332,6 +340,9 @@ | |||
| PROJECT_TYPE = props.getProperty("project.type","[ \"Customer Project\", \"Internal Project\", \"Product\", \"Service\"]"); | |||
| LICENSE_IDENTIFIERS = props.getProperty("license.identifiers", "[]"); | |||
| COMPONENT_CATEGORIES = props.getProperty("component.categories", "[ \"framework\", \"SDK\", \"big-data\", \"build-management\", \"cloud\", \"content\", \"database\", \"graphics\", \"http\", \"javaee\", \"library\", \"mail\", \"mobile\", \"security\", \"testing\", \"virtual-machine\", \"web-framework\", \"xml\"]"); | |||
| PROJECT_ROLES = props.getProperty("custommap.project.roles", "[ \"pre-sales consultant\", \"primary contact\"]"); | |||
There was a problem hiding this comment.
Hi, two suggestions: a) how about starting each role name with capital letter (as with the usual field labels, and b) is pre-sales consultant an intended role here? (just googleling for common project roles) and what would be primary contact (apart from project manager or responsible), how about- from googleling for common project roles, in case the Pre sales consultant was not on purpose.:
Stakeholder
Analyst
Contributor
Accountant
End user
Quality manager
Test manager
Technical writer
Key user
* displayed in details-view (as mailto-link) and edit view * keys can be configured in sw360-portlet: sw360.properties * edit-view: user can choose key out of drop down list and must enter valid email address per row * Moderation request generation for role-property * Diff display of properties of type map of set to set of strings * merge for properties of type map of set to set of strings Signed-off-by: Maximilian Huber <external.maximilian.huber2@bosch-si.com>
|
@alex-evo @mcjaeger: the roles are now updated and the branch is rebased. |
|
not so important: actually sw360.properties with old values overwrites default values! |
This PR adds the following features: