Commit Graph

584 Commits

Author SHA1 Message Date
SirWayne
0856b6db8c Merge branch 'fix_dialog_window_must_not_close_after_save_if_duplicate_exists' of https://github.com/bsinno/hawkbit.git into fix_dialog_window_must_not_close_after_save_if_duplicate_exists 2016-08-19 18:26:11 +02:00
SirWayne
9f9277d3ee Fix save and close order for common window dialog. Close the window
after the save action, because after the close action there is no UI
anymore. So an error cannot shown on the UI.

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-19 18:25:50 +02:00
Gaurav
86111ac70c Fixed sonar issues.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-19 18:08:34 +02:00
SirWayne
fe113a4bc6 Fix save and close order for common window dialog. Close the window
after the save action, because after the close action there is no UI
anymore. So an error cannot shown on the UI.

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-19 17:44:23 +02:00
Gaurav
6babfe3603 Merge branch 'fix_dialog_window_must_not_close_after_save_if_duplicate_exists' of https://github.com/bsinno/hawkbit/ into fix_dialog_window_must_not_close_after_save_if_duplicate_exists 2016-08-19 17:25:50 +02:00
Gaurav
f7f73ae12c Fixed the sonar issues.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-19 17:25:35 +02:00
Melanie Retter
4c143cf9d2 Add javaDoc, remove unused method parameter
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-19 16:23:53 +02:00
Gaurav
381254fa67 Fixed Sonar issues.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-19 15:34:29 +02:00
Melanie Retter
36fb2f2b54 Merge branch 'master' into
fix_dialog_window_must_not_close_after_save_if_duplicate_exists

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIWindowDecorator.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/CreateUpdateTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-19 14:29:15 +02:00
Dominic Schabel
01d5d5e931 Merge branch 'master' into fix-improve-code-quality
# Conflicts:
#	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java

Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-08-19 12:33:46 +02:00
Gaurav
a6345270f5 Merge branch 'master' into fix_dialog_window_must_not_close_after_save_if_duplicate_exists 2016-08-19 11:20:11 +02:00
Gaurav
b2c1e78c72 Fixed the sonar issues
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-19 11:17:18 +02:00
Gaurav
b80323caf9 Re-factored the code as per the sonar standards.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-19 10:44:12 +02:00
Michael Hirsch
9610c83085 Merge pull request #271 from bsinno/fix_upload_status_dialog_showing_all_files
add files to status dialog when receive upload
2016-08-19 08:22:09 +02:00
SirWayne
4585c55689 Set closable to false that to disable 1 cross
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-18 15:32:25 +02:00
SirWayne
d05b5ebc1f Rename builder methode for TextComponent. Fix to set textfield ids.
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-18 11:15:00 +02:00
Michael Hirsch
630cf09162 add files to status dialog when receive upload
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-18 08:42:55 +02:00
Gaurav
b301f73aa4 # WARNING: head commit changed in the meantime
Signed-off-by:
2016-08-17 18:11:27 +02:00
Gaurav
c6c76332c0 Fixed the bug for textfield stays highlighted in red in the add
distribution window.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-17 18:05:35 +02:00
Gaurav
47726690c4 # WARNING: head commit changed in the meantime
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-17 17:42:06 +02:00
Gaurav
fafaf54e37 Refactored the code to fix the sonar issues.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-17 17:36:45 +02:00
SirWayne
e6f80756f1 Merge from master
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-17 09:34:59 +02:00
SirWayne
7ea17c54f1 Add TextBuilderArea
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-17 09:02:04 +02:00
SirWayne
8d7cdb7e13 Merge branch 'fix-improve-code-quality' of https://github.com/bsinno/hawkbit.git into fix-improve-code-quality 2016-08-16 17:33:27 +02:00
SirWayne
1d825f9c74 Add a textfield builder
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-16 17:33:06 +02:00
Melanie Retter
3e0c78e832 Remove unnecessary style from ActionButtonLayout of CommonDialogWindow
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-16 17:28:37 +02:00
Dominic Schabel
1094c3c12f Found another place where a NOT was missing
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-08-16 16:11:15 +02:00
Dominic Schabel
876c599617 Found another place where a NOT was missing
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-08-16 15:28:59 +02:00
SirWayne
a4703ea0a8 Merge remote-tracking branch 'eclipse/master' into
fix-improve-code-quality

Conflicts:
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityPropertyChangeListener.java
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-16 15:17:30 +02:00
SirWayne
9545ff5626 Merge branch 'fix-improve-code-quality' of https://github.com/bsinno/hawkbit.git into fix-improve-code-quality 2016-08-16 14:51:42 +02:00
SirWayne
8ccc9811a8 Add LabelBuilder
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-16 14:51:36 +02:00
SirWayne
a51bf0ac02 Add LabelBuilder
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-16 14:38:21 +02:00
Dominic Schabel
5e48569462 Found another place where a NOT was missing
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-08-16 13:41:15 +02:00
Dominic Schabel
9e1754126e Added missing NOT and did some small other code improvements
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-08-16 12:53:27 +02:00
SirWayne
d3d07046ec Add a WindowBuilder for the dialogs
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-16 11:47:24 +02:00
SirWayne
4e7f547392 Add a WindowBuilder for the dialogs
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-16 11:46:42 +02:00
Dominic Schabel
a9e15041d8 Minor code improvements
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-08-15 18:16:55 +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