Release/2.7.5.4 #2563
Merged
Release/2.7.5.4 #2563
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#2548 Fixed import graphics
…e_System_event_alarm_User_Login #806 Unable to disable System event alarm User Login
…arn to debug; catch Exception
…on_details_while_initializing_MangoContextListener #2557 Logging expcetion details while initializing MangoContextListener
…corrected template for comment_list_by_eventid cache; added ability change logging level for Spring Cache; added field typeKey in UserComment (UserComment not serializable); refactor PendingEventsDAO - moved high level abstraction methods from PendingEventsDAO to PendingEventService; added method in UserCommentCachable.findByEventAll(), IUserCommentDAO.getEventComments(); use caching UserComment type event in EventDAO; removed deprecated method UserCommentDAO.deleteUserCommentEvent; removed deprecated class PointEventDetectorCacheEntry
…_in_the_AlarmLevelController #2559 Using the cache in the AlarmLevelController
…ment_type_event #2560 Fixed cache UserComment type event - added comment_list cache; …
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| }) | ||
| void removeByEvent(long eventId); | ||
| void removeByEvent(int eventId); |
Check notice
Code scanning / CodeQL
Useless parameter
…_after_logged #2544 Fixed 'not logged in' after logged
…empty extension and exists;
- Added class: EmailValidator used in User.validate
- Added test for MailValidator: EmailValidatorTest.java
- Validation fix, currently lets emails starting with a capital letter through - Added detailed tests output
- removed unnecesary comments
…on_in_users_details Fix/#623 fixed email validation in users details
…educe duplicate beans in spring container
…emoved commented definition for databaseSource bean in applicationContext.xml
| } catch (EmptyResultDataAccessException ex) { | ||
| LOG.warn("name: " + name + ", usersProfileId: " + usersProfileId + ", msg: " + ex.getMessage()); |
Check failure
Code scanning / CodeQL
Log Injection
| @@ -353,13 +381,15 @@ | |||
| }, keyHolder); | |||
| return keyHolder.getKey().intValue(); | |||
| } catch (EmptyResultDataAccessException ex) { | |||
| LOG.warn("usersProfileXid: " + usersProfileXid + ", usersProfileName: " + usersProfileName + ", msg: " + ex.getMessage()); | |||
Check failure
Code scanning / CodeQL
Log Injection
…protection (problem with chrome, macos); added security definition for websocket: /event/update, /queue/errors, /session, /listusers, /websocketStats; change exception type from IllegalStateException on PermissionException in AuthenticationUtils.authenticateLocalRaiseEvent; removed unuse import com.serotonin.util.StringUtils in LoginAuthenticationSuccessHandler;
…asswordAuthenticationToken
…_in_Publisher #2611 Fixed event message in Publisher -
| LOG.debug("process[" + user + "]" + "message: " + message); | ||
| userEventServiceWebSocket.sendEventUpdate(principal.getUser(), WsEventMessage.reset()); | ||
| return "user: " + user + ", message: " + message; | ||
| public String process(String message, UsernamePasswordAuthenticationToken principal, StompHeaderAccessor accessor) { |
Check notice
Code scanning / CodeQL
Useless parameter
…cache in env.properties (abilit.cacheEnable=false); added parameter 'Event Pending Limit' configure from System Settings on new and old ui, in env.properties (event.pending.limit); deprecated class: EventDao; deprecated methods: EventService.getPendingSimpleEvents, EventDAO.getEventsForDataPoint, EventDAO.getPendingEvents, EventDAO.getPendingEvents; deprecated field: SystemSettingsDAO.DELETE_USERS; added methods: MangoEvent.isXidUnique, MangoEvent.getPendingEventsAlarmLevelMin, MangoEvent.getPendingEventsAlarmLevelMin, PendingEventsDAO.getPendingEvents with limit, EventDAO.getPendingEventsLimitAlarmLevelMin, EventDAO.getEventsForDataPointLimit, EventDAO.getPendingEventsLimit, EventDAO.getPendingEventsLimit; separation config old and new cache for PointEventDetectorCacheable in env.properties (eventdetector.cache.enabled), removed unless for selectPointEventDetectors;
…rgument on forceDisabledCache in method EventService.getPendingEventsAlarmLevelMin; fixed EventsController.getData
Resetting the alarm for multiple requests at once
- Added if condition in changeContentText.jsp which checks if point that is being edited is in Point Detail Menu. - Added hideClosingHint flag for model to use it in if condition - Small fix with translation
- Placed model.put("hideClosingHint", true); function under if condition to reduce amount of function calls
…er 'Enabled Event Pending Cache' to System Settings old and new ui;
…o_close_inside_datapoint_details_without_need #2521 Text "double click to close" inside datapoint details without need
…numeric data point - getSourceDescriptionKey - added Unknown key
…r_has_occured_in_Point_details_menu_on_alphanumeric_data_point #2621 Fixed A server error has occured in Point details menu on alpha…
…d/libs folder is empty/deleted - Added task in build.gradle that checks for .war file in build/libs every time 'deployTeomcat' task is used
…d/libs folder is empty/deleted - Added task in build.gradle that checks for .war file in build/libs every time 'deployTeomcat' task is used
…ctorsXid and dataPointId
…eployTomcat_doesnt_return_error_when_build_libs_folder_is_empty_deleted #2623 Fixed Gradle task 'deployTomcat' doesn't return error when build/libs folder is empty/deleted
enabling Semgrep (https://semgrep.dev/) scanning
* deprecated class CustomSQLEroorCodesTranslator; * fixed get value for disabled column from database;
…eckbox_Disabled_in_Maintenance_event #2555 Fixed error save checkbox Disabled in Maintenance events -
…for_a_large_number_of_events
…t_Detectors #2625 Fixed validate Event Detectors - extends key cache to eventDete…
…ity_for_a_large_number_of_events #2618 Improved stability for a large number of events - disabled old …
…ased_lock #2634 Fix possible Unreleased lock - Lock outside the try block
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.