Commit Graph

748 Commits

Author SHA1 Message Date
SirWayne
aa5e4d0601 - Fix ds assignment result
- Fix drag and drop to assignment

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-15 17:57:52 +02:00
Gaurav
75905472c8 Fix for the dialog window must not close after save if duplicate exists.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-15 15:38:08 +02:00
Dominic Schabel
3accac9ade Minor code improvements
Signed-off-by: Dominic Schabel dominic.schabel@bosch-si.com
2016-08-15 13:17:37 +02:00
Gaurav
86f13452c5 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-08-15 11:42:03 +02:00
Jonathan Philip Knoblauch
971b0aecb6 Refactoring error handler
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-12 16:08:44 +02:00
Jonathan Philip Knoblauch
5d250a03be Refactoring for error handler
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-12 14:28:25 +02:00
Melanie Retter
c3145bed58 Refactor: Log message can be overwritten
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-11 17:51:39 +02:00
Melanie Retter
643eb23839 Revert method deletion
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-11 16:25:12 +02:00
Melanie Retter
92fb82129a Refactoring HawkbitUiErrorHandler
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-11 16:05:22 +02:00
Melanie Retter
ff39ecfc75 Correct typo
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-11 14:15:19 +02:00
Gaurav
4534ece860 Fixed the issue of refreshing the tag details section for the
distributions.

Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-11 14:03:40 +02:00
Melanie Retter
6205126279 Lock is only needed when BulkUpload
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-11 13:54:28 +02:00
Melanie Retter
3ec569f259 Merge branch 'fix_lock_session_on_show_error_notification' of
https://github.com/bsinno/hawkbit.git into
fix_lock_session_on_show_error_notification

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitUIErrorHandler.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-11 13:29:31 +02:00
Melanie Retter
9cc63ce128 Refactor UI Error Handler. Need to put UI in constructor. So the message
is shown in the same browser window.

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-11 13:25:24 +02:00
Gaurav
d7539de64d Merge branch 'master' into feature_enable_push_in_deployment_view
Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/eventbus/event/TargetDeletedEvent.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleMetadatadetailslayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java


Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-10 11:44:23 +02:00
Michael Hirsch
913692f947 lock session on error showing error notification
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-10 09:22:57 +02:00
Michael Hirsch
8c39fc98e0 Merge branch 'master' into Feature_Improve_Code_Quality 2016-08-09 17:54:11 +02:00
Gaurav
894e9dc3cf Merge branch 'master' into feature_enable_push_in_deployment_view 2016-08-09 13:15:24 +02:00
Michael Hirsch
4baf8c6ce0 Merge pull request #267 from bsinno/fix_concurrency_on_UI_causes_NullpointerException
Fix concurrency on ui causes nullpointer exception
2016-08-09 11:51:14 +02:00
Michael Hirsch
df315bb42c remove tagToken from map
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-09 11:50:59 +02:00
Michael Hirsch
9cb1fe170b clear tagDetails in BulkUpload
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-09 11:50:18 +02:00
Dominic Schabel
d3edcb0044 Merge branch 'master' into Feature_Improve_Code_Quality
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>

# Conflicts:
#	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
2016-08-09 09:02:33 +02:00
Michael Hirsch
c4c205ea27 Merge pull request #262 from bsinno/fix_enable_showing_errors_during_bulk_upload
Fix enable showing errors during bulk upload
2016-08-08 16:47:43 +02:00
Dominic Schabel
9c7db25197 Merge branch 'master' into Feature_Improve_Code_Quality
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>

# Conflicts:
#	hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/WithSpringAuthorityRule.java
2016-08-08 16:40:00 +02:00
Michael Hirsch
f4c642b401 Merge pull request #265 from bsinno/fix_concurrency_on_UI_causes_NullpointerException
clear the tagDetails map as well
2016-08-08 16:21:17 +02:00
Jonathan Philip Knoblauch
8a1207337b Changed buildNotification method that error log dosn't have to be displayed in all cases
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-08 16:15:55 +02:00
Michael Hirsch
adafaa9489 clear the tagDetails map as well
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-08 16:15:15 +02:00
Gaurav
e42f8164a8 Incorporated the review comments.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-08 13:24:12 +02:00
Michael Hirsch
c4b0bdfa86 Merge pull request #264 from bsinno/fix_concurrency_on_UI_causes_NullpointerException
Fix for the concurrency issue on UI causes on the Nullpointer Exception.
2016-08-08 08:49:21 +02:00
SirWayne
9febe16453 Fix sonar issue
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-05 16:42:09 +02:00
Gaurav
88c1253f66 Fix for the concurrency issue on UI causes on the Nullpointer Exception.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-05 16:02:20 +02:00
SirWayne
5f20066cff Fix sonar issue
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-05 15:55:49 +02:00
SirWayne
c71cf4852a fix sonar issues
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-05 14:58:17 +02:00
Jonathan Philip Knoblauch
f3f9dbc665 Added method to sync after upload
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-05 13:50:46 +02:00
Jonathan Philip Knoblauch
89605b0984 Changed error and how it is connected to current page
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-05 12:42:03 +02:00
SirWayne
88e5bdf8f4 Fix criticals sonar issues
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-05 10:51:11 +02:00
Gaurav
9bd47a5c55 Added the message in the message.properties.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-05 10:49:24 +02:00
Gaurav
f964f7c0c6 Formatted the code
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-04 17:58:29 +02:00
Gaurav
303a668f16 Fix for the entity lock exception for unassign soft module from DS
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-04 17:36:28 +02:00
Jonathan Philip Knoblauch
709ea990df Removed component that was not needed
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-04 16:19:35 +02:00
SirWayne
a1e939e233 Merge remote-tracking branch 'eclipse/master' into
Feature_Improve_Code_Quality

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-04 16:04:35 +02:00
Jonathan Philip Knoblauch
11bb282699 Refactoring for button enable
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-04 15:57:20 +02:00
Jonathan Philip Knoblauch
6be3d72a5a changed connector for error
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-04 13:57:06 +02:00
Jonathan Philip Knoblauch
cad916c1d7 Refactoring of bulk upload
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-04 10:04:08 +02:00
Jonathan Philip Knoblauch
5beb10b8db Removed uiNotification
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-03 17:51:52 +02:00
Jonathan Philip Knoblauch
43f71cc976 Catch RuntimeException and handle with Vaadin error handler
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-03 17:31:46 +02:00
Gaurav
0854d023fb Fixed the code for the create ds for deployment view and fixed the issue
for delete metadata(getting optimistic lock exception)
2016-08-02 18:32:44 +02:00
Gaurav
fa3b5d69e9 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-08-01 17:25:19 +02:00
Gaurav
1d72257b9f Merge branch 'feature_enable_push_in_deployment_view' of
https://github.com/bsinno/hawkbit/ into
feature_enable_push_in_deployment_view

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java
2016-08-01 16:11:11 +02:00
Melanie Retter
b8bc46d299 Add JavaDoc
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-01 15:34:00 +02:00