Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Component merge does not seem to be able to handle complex fields #596

Closed
maxhbr opened this issue Jul 24, 2019 · 0 comments · Fixed by #668
Closed

Component merge does not seem to be able to handle complex fields #596

maxhbr opened this issue Jul 24, 2019 · 0 comments · Fixed by #668
Labels
bug Something isn't working
Milestone
Work Package 004

Comments

@maxhbr
Copy link
Contributor

maxhbr commented Jul 24, 2019

the backend code of the component merge looks like that it is not build to handle complex fields like externalIds or additionalRoles.
https://github.com/eclipse/sw360/blob/b8dffa51f6b8a4305fc7ebb16b45214b472d6ebe/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ComponentDatabaseHandler.java#L501-L509

It just merges "plainFields", Releases and Attachments.
@maxhbr maxhbr mentioned this issue Jul 24, 2019
Merged
1 task
@mcjaeger mcjaeger added this to the Backlog milestone Aug 6, 2019
@mcjaeger mcjaeger modified the milestones: Backlog, Work Package 004 Sep 3, 2019
@lepokle lepokle added the bug Something isn't working label Sep 10, 2019
lepokle added a commit to siemens/sw360 that referenced this issue Sep 25, 2019
@lepokle
fix(merge): allow merging of complex fields, style improvements
87a27ae 
* Merging complex fields
This commits fixes the merge of the two complex fields 'external ids' and
'additional data' in components.

* Style impprovements
Layout and style of merge wizard have been improved. Style for DisplayMap
(for external ids and additonal data) has been improved.

Closes eclipse-sw360#596

Signed-off-by: Leo von Klenze <leo.vonklenze@scansation.de>
@lepokle lepokle mentioned this issue Sep 25, 2019
Merged
lepokle added a commit to siemens/sw360 that referenced this issue Sep 29, 2019
@lepokle
fix(merge): allow merging of complex fields, style improvements
5b79886 
* Merging complex fields
This commits fixes the merge of the two complex fields 'external ids' and
'additional data' in components.

* Style impprovements
Layout and style of merge wizard have been improved. Style for DisplayMap
(for external ids and additonal data) has been improved.

Closes eclipse-sw360#596

Signed-off-by: Leo von Klenze <leo.vonklenze@scansation.de>
lepokle added a commit to siemens/sw360 that referenced this issue Sep 30, 2019
@lepokle
fix(merge): allow merging of complex fields, style improvements
3252b2d 
* Merging complex fields
This commits fixes the merge of the two complex fields 'external ids' and
'additional data' in components.

* Style impprovements
Layout and style of merge wizard have been improved. Style for DisplayMap
(for external ids and additonal data) has been improved.

Closes eclipse-sw360#596

Signed-off-by: Leo von Klenze <leo.vonklenze@scansation.de>
lepokle added a commit to siemens/sw360 that referenced this issue Sep 30, 2019
@lepokle
fix(merge): allow merging of complex fields, style improvements
5ebffad 
* Merging complex fields
This commits fixes the merge of the two complex fields 'external ids' and
'additional data' in components.

* Style impprovements
Layout and style of merge wizard have been improved. Style for DisplayMap
(for external ids and additonal data) has been improved.

Closes eclipse-sw360#596

Signed-off-by: Leo von Klenze <leo.vonklenze@scansation.de>
lepokle added a commit to siemens/sw360 that referenced this issue Oct 1, 2019
@lepokle
fix(merge): allow merging of complex fields, style improvements
97008f3 
* Merging complex fields
This commits fixes the merge of the two complex fields 'external ids' and
'additional data' in components.

* Style impprovements
Layout and style of merge wizard have been improved. Style for DisplayMap
(for external ids and additonal data) has been improved.

Closes eclipse-sw360#596

Signed-off-by: Leo von Klenze <leo.vonklenze@scansation.de>
lepokle added a commit that referenced this issue Oct 3, 2019
@lepokle
Merge pull request #668 from siemens/lepokle/#596/component-merge-com…
0a15523 
…plex-fields

fix(merge): allow merging of complex fields, style improvements

review-by: nutan.das@siemens.com
tested-by: nutan.das@siemens.com
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug Something isn't working
Projects
None yet
Milestone
Work Package 004
Development

Successfully merging a pull request may close this issue.

fix(merge): allow merging of complex fields, style improvements siemens/sw360
3 participants
@lepokle @maxhbr @mcjaeger