Skip to content

Commit

Permalink
SAK-31434 Enable PA system by default. (sakaiproject#2990)
Browse files Browse the repository at this point in the history
  • Loading branch information
buckett authored and jonespm committed Jul 5, 2016
1 parent 8c8f279 commit 3c55959
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4483,3 +4483,31 @@

# The grace period after the term ends
#course_site_removal_service.num_days_after_term_ends=14


# ###############################
# PA System
# ###############################
# Whether or not to show popups and banners to users.
# DEFAULT: true
# pasystem.enabled=false
#
# Whether to automatically create/upgrade the PA System's database tables on startup. This
# is required for the first time you start the PA System, but there's no harm in leaving it enabled.
# If auto.ddl is set you don't need to set this property as well.
# DEFAULT: false
# pasystem.auto.ddl=false
#
# The number of milliseconds to hide a medium priority banner once it
# has been dismissed.
# DEFAULT: 86400000
# pasystem.banner.temporary-timeout-ms=86400000
#
# The "later" in "Remind me later" when a popup is dismissed.
# DEFAULT: 86400000
# pasystem.popup.temporary-timeout-ms=86400000
#
# Whether to warn users # via banner if their computer's timezone doesn't match their Sakai
# profile timezone.
# DEFAULT: false
# pasystem.timezone-check=true
2 changes: 1 addition & 1 deletion pasystem/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ The Public Announcement system provides:
You can control the Public Announcement system with the following
properties:

* pasystem.enabled (default: false) -- Whether or not to show popups
* pasystem.enabled (default: true) -- Whether or not to show popups
and banners to users.

* pasystem.auto.ddl (default: false) -- Whether to automatically
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ public void handle(HttpServletRequest request, HttpServletResponse response, Map
context.put("banners", paSystem.getBanners().getAll());
context.put("popups", paSystem.getPopups().getAll());
context.put("timezoneCheckActive", ServerConfigurationService.getBoolean("pasystem.timezone-check", false));
context.put("paSystemActive", ServerConfigurationService.getBoolean("pasystem.enabled", false));
context.put("paSystemActive", ServerConfigurationService.getBoolean("pasystem.enabled", true));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1772,7 +1772,7 @@ public SecurityAdvice isAllowed(String userId, String function,
String userWarning = (String) s.getAttribute("userWarning");
rcontext.put("userWarning", new Boolean(StringUtils.isNotEmpty(userWarning)));

if (ServerConfigurationService.getBoolean("pasystem.enabled", false)) {
if (ServerConfigurationService.getBoolean("pasystem.enabled", true)) {
PASystem paSystem = (PASystem) ComponentManager.get(PASystem.class);
rcontext.put("paSystemEnabled", true);
rcontext.put("paSystem", paSystem);
Expand Down

0 comments on commit 3c55959

Please sign in to comment.