Skip to content

Commit 968fa68

Browse files
aravindm711Marilyth
authored andcommitted
Userlist filter implementation (Open-MSS#971)
* improved filter implementation * modified filter implementation
1 parent b39c06c commit 968fa68

1 file changed

Lines changed: 6 additions & 15 deletions

File tree

mslib/msui/mscolab_admin_window.py

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -121,23 +121,14 @@ def deselect_all(self, table):
121121
if table.item(row_num, 0).isSelected() and table.isRowHidden(row_num) is False:
122122
table.selectRow(row_num)
123123

124-
# TODO: Think of a more cleaner implementation.
125124
def apply_filters(self, table, text_filter, permission_filter=None):
126-
row_count = table.rowCount()
125+
# Check if no permission or permission is all
126+
all_items = permission_filter is None or permission_filter == "all"
127127

128-
# Filter items with permissions
129-
if permission_filter is None or permission_filter == "all":
130-
permitted_items = range(row_count)
131-
else:
132-
permitted_items = [
133-
row_num
134-
for row_num in range(row_count)
135-
if permission_filter == table.item(row_num, 1).text()
136-
]
137-
138-
# Display items that have permission and text_filter
139-
for row_num in range(row_count):
140-
if row_num in permitted_items and text_filter in table.item(row_num, 0).text():
128+
# Show/Hide item based on permission and text_filter
129+
for row_num in range(table.rowCount()):
130+
permitted = True if all_items else permission_filter == table.item(row_num, 1).text()
131+
if permitted and text_filter in table.item(row_num, 0).text():
141132
table.showRow(row_num)
142133
else:
143134
table.hideRow(row_num)

0 commit comments

Comments
 (0)