Skip to content

Commit 3c327a3

Browse files
sughicssughics
authored
Merge pull request #173 from AtlasOfLivingAustralia/develop
Merge develop to master for 2.0.2 release
2 parents 711691e + 76cfa02 commit 3c327a3

File tree

4 files changed

+61
-33
lines changed

4 files changed

+61
-33
lines changed

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ plugins {
3030
}
3131

3232

33-
version "2.0.1"
33+
version "2.1.0-SNAPSHOT"
3434
group "au.org.ala"
3535

3636
apply plugin:"eclipse"

‎grails-app/init/au/org/ala/alerts/BootStrap.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ class BootStrap {
251251
recordJsonPath: '\$.[*]',
252252
idJsonPath: 'id'
253253
])).save()
254-
new PropertyPath([name: "last_blog_id", jsonPath: "\$", query: newBlogs, fireWhenChange: true]).save()
254+
new PropertyPath([name: "last_blog_id", jsonPath: "\$", query: newBlogs]).save()
255255
}
256256
log.info("end of preloadQueries")
257257
}

‎grails-app/services/au/org/ala/alerts/NotificationService.groovy

-11
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,6 @@ class NotificationService {
111111
//set the has changed
112112
qcr.queryResult.hasChanged = hasPropertiesChanged(query, propertyPaths, previousJson, processedJson)
113113

114-
//set the last result
115-
qcr.queryResult.lastResult = gzipResult(processedJson)
116-
117-
//set the property values
118-
def propertyValues = []
119-
propertyPaths.values().each {
120-
// new PropertyValue()
121-
// it.
122-
}
123-
124-
125114
} catch (Exception e) {
126115
log.error("[QUERY " + query.id + "] There was a problem checking the URL :" + urlString, e)
127116
qcr.errored = true

‎grails-app/views/admin/index.gsp

+59-20
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,65 @@
1818
</g:if>
1919

2020
<div id="admin-functions">
21-
<ul>
22-
<li><g:link controller="notification" action="myAlerts">View my alerts</g:link></li>
23-
<li><g:link controller="admin" action="debugAllAlerts">Debug all alerts</g:link></li>
24-
<li><g:link controller="admin" action="updateUserEmails">Update user emails with CAS</g:link></li>
25-
<li><g:link controller="admin" action="repairNotificationsWithoutUnsubscribeToken">Fix empty notification_token values in Notification table (unsubscribe links with '?token=NULL')</g:link></li>
26-
<li><g:link controller="admin" action="repairUsersWithoutUnsubscribeToken">Fix empty notification_token values in user table (unsubscribe all links with '?token=NULL')</g:link></li>
27-
<li><g:link controller="query" action="list">View list of alert types</g:link></li>
28-
<li><g:link controller="admin" action="deleteOrphanAlerts">Delete orphaned queries</g:link></li>
29-
<li class="controller"><g:link controller="quartz">View scheduling</g:link></li>
30-
<li class="controller"><g:link controller="admin" action="createBulkEmailForRegisteredUsers">
31-
Ad hoc bulk email to registered users</g:link></li>
32-
<li class="controller"><g:link controller="admin" action="notificationReport">
33-
Each query type with counts for users</g:link></li>
34-
<li class="controller"><a href="${request.contextPath}/admin/user">Manage alerts for users (find user)</a></li>
35-
<li class="controller"><a href="${request.contextPath}/admin/biosecurity">Manage BioSecurity alerts</a></li>
36-
<li><g:link controller="admin" action="sendTestEmail">Send test email to yourself (tests server can send emails)</g:link></li>
37-
<plugin:isAvailable name="alaAdminPlugin">
38-
<li style="margin-top:1em;"><g:link controller="alaAdmin" action="index">ALA admin plugin page (system message, app config functions, build info)</g:link>
39-
</plugin:isAvailable>
40-
</ul>
21+
<div class="panel-heading">
22+
<h3>User Management</h3>
23+
<ul>
24+
<li><g:link controller="admin" action="updateUserEmails">Update user emails with CAS</g:link> - synchronise alerts user database with users from CAS.</li>
25+
<li class="controller"><a href="${request.contextPath}/admin/user">Manage alerts for users (find user)</a> - Find user(s) and manage their subscriptions.</li>
26+
</ul>
27+
</div>
28+
29+
<div class="panel-heading">
30+
<h3>Alert and Query Management</h3>
31+
<ul>
32+
<li><g:link controller="notification" action="myAlerts">View my alerts</g:link> - View my current subscriptions.</li>
33+
<li><g:link controller="query" action="list">View list of alert types</g:link> - View the list of all available custom and default alerts.</li>
34+
<li class="controller"><g:link controller="admin" action="notificationReport">
35+
View each alert type with counts for users</g:link> - View the list of all available custom and default alerts with user subscription count.</li>
36+
<li><g:link controller="admin" action="debugAllAlerts">Debug all alerts</g:link> - Dry-run of all alerts to determine if emails will be triggered on the next schedule. </li>
37+
38+
<li><g:link controller="admin" action="deleteOrphanAlerts">Delete orphaned queries</g:link> - Remove queries no longer associated with Alert Notification/Subscription.</li>
39+
</ul>
40+
<h4>Fix empty/invalid notification_token</h4>
41+
<ul>
42+
<li><g:link controller="admin" action="repairNotificationsWithoutUnsubscribeToken">Fix empty notification_token values in Notification table (unsubscribe links with '?token=NULL')</g:link></li>
43+
<li><g:link controller="admin" action="repairUsersWithoutUnsubscribeToken">Fix empty notification_token values in user table (unsubscribe all links with '?token=NULL')</g:link></li>
44+
</ul>
45+
</div>
46+
<div class="panel-heading">
47+
<h3>Manage Scheduling</h3>
48+
<ul>
49+
<li class="controller"><g:link controller="quartz">View scheduling</g:link> - Run and/or reschedule alerts.</li>
50+
</ul>
51+
</div>
52+
53+
<div class="panel-heading">
54+
<h3>Email Management </h3>
55+
<ul>
56+
<li class="controller"><g:link controller="admin" action="createBulkEmailForRegisteredUsers">
57+
Ad hoc bulk email to registered users</g:link> - Create and send custom email to registered users.</li>
58+
<li><g:link controller="admin" action="sendTestEmail">Send test email to yourself (tests server can send emails)</g:link>- Empty alert email to current user.</li>
59+
</ul>
60+
</div>
61+
62+
<div class="panel-heading">
63+
<h3>BioSecurity Alerts</h3>
64+
<ul>
65+
<li class="controller"><a href="${request.contextPath}/admin/biosecurity">Manage BioSecurity alerts</a> - Add, update, or remove BioSecurity alerts and users.</li>
66+
</ul>
67+
</div>
68+
69+
<div class="panel-heading">
70+
<h3>Application Management </h3>
71+
<ul>
72+
<plugin:isAvailable name="alaAdminPlugin">
73+
<li style="margin-top:1em;"><g:link controller="alaAdmin" action="index">ALA admin plugin page (system message, app config functions, build info)</g:link>
74+
</plugin:isAvailable>
75+
</ul>
76+
</div>
77+
78+
79+
4180
</div>
4281
</body>
4382
</html>

0 commit comments

Comments
 (0)