Skip to content

Commit 5d74b56

Browse files
noel kneibneoclust
authored andcommitted
(Audit view) Filter by relay jid
In group deployment, we can now filter by relay jid
1 parent ffbce20 commit 5d74b56

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

ChangeLog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Pulse 2 4.6.8
1212
* [FEATURE] Allow to retrieve the glpi uuid if missing
1313
* [FEATURE] Convergences are now identified by their name + date
1414
* [FEATURE] Do not display old view when creating the packages.
15+
* [FEATURE] Allow to filter searches based on the relay ji
1516
* [BUGFIX] Fix backtrace during deployment
1617
* [BUGFIX] Fixes listing of packages for deployment
1718
* [BUGFIX] Add acl for relays actions

services/pulse2/database/xmppmaster/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3684,6 +3684,10 @@ def getdeployment(self, session, command_id, filter="", start=0, limit=-1):
36843684
Deploy.state.contains(criterion),
36853685
Deploy.inventoryuuid.contains(criterion),
36863686
))
3687+
3688+
elif filter == "relays" and criterion != "":
3689+
query = query.filter(Deploy.jid_relay.contains(criterion))
3690+
36873691
if filter != 'infos':
36883692
count = query.count()
36893693
if limit != -1:

web/modules/xmppmaster/xmppmaster/logs/viewgrouplogs.in.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class="searchfieldreal"
4949

5050
<option value="status"><?php echo _T("Deployment Status", "xmppmaster");?></option>
5151
<option value="infos"><?php echo _T("Machine Inventory", "xmppmaster");?></option>
52+
<option value="relays"><?php echo _T("Relays", "xmppmaster");?></option>
5253
</select>
5354

5455
<span class="searchfield">

0 commit comments

Comments
 (0)