apol: rename models to make it clear they are tables

This commit is contained in:
Chris PeBenito 2016-04-01 14:03:41 -04:00
parent 14aa86c99d
commit b416862554
6 changed files with 12 additions and 12 deletions

View File

@ -26,7 +26,7 @@ from setools import MLSRuleQuery
from ..logtosignal import LogHandlerToSignal
from ..models import SEToolsListModel, invert_list_selection
from ..mlsrulemodel import MLSRuleListModel
from ..mlsrulemodel import MLSRuleTableModel
from ..widget import SEToolsWidget
from .queryupdater import QueryResultsUpdater
@ -74,7 +74,7 @@ class MLSRuleQueryTab(SEToolsWidget, QScrollArea):
self.tclass.setModel(self.class_model)
# set up results
self.table_results_model = MLSRuleListModel(self)
self.table_results_model = MLSRuleTableModel(self)
self.sort_proxy = QSortFilterProxyModel(self)
self.sort_proxy.setSourceModel(self.table_results_model)
self.table_results.setModel(self.sort_proxy)

View File

@ -26,7 +26,7 @@ from setools import RBACRuleQuery
from ..logtosignal import LogHandlerToSignal
from ..models import SEToolsListModel, invert_list_selection
from ..rbacrulemodel import RBACRuleListModel
from ..rbacrulemodel import RBACRuleTableModel
from ..widget import SEToolsWidget
from .queryupdater import QueryResultsUpdater
@ -84,7 +84,7 @@ class RBACRuleQueryTab(SEToolsWidget, QScrollArea):
self.tclass.setModel(self.class_model)
# set up results
self.table_results_model = RBACRuleListModel(self)
self.table_results_model = RBACRuleTableModel(self)
self.sort_proxy = QSortFilterProxyModel(self)
self.sort_proxy.setSourceModel(self.table_results_model)
self.table_results.setModel(self.sort_proxy)

View File

@ -26,7 +26,7 @@ from setools import TERuleQuery
from ..logtosignal import LogHandlerToSignal
from ..models import PermListModel, SEToolsListModel, invert_list_selection
from ..terulemodel import TERuleListModel
from ..terulemodel import TERuleTableModel
from ..widget import SEToolsWidget
from .queryupdater import QueryResultsUpdater
@ -92,7 +92,7 @@ class TERuleQueryTab(SEToolsWidget, QScrollArea):
self.bool_criteria.setModel(self.bool_model)
# set up results
self.table_results_model = TERuleListModel(self)
self.table_results_model = TERuleTableModel(self)
self.sort_proxy = QSortFilterProxyModel(self)
self.sort_proxy.setSourceModel(self.table_results_model)
self.table_results.setModel(self.sort_proxy)

View File

@ -23,9 +23,9 @@ from PyQt5.QtCore import Qt, QModelIndex
from .models import SEToolsTableModel
class MLSRuleListModel(SEToolsTableModel):
class MLSRuleTableModel(SEToolsTableModel):
"""MLS rule model. Represents rules as a column."""
"""A table-based model for MLS rules."""
headers = defaultdict(str, {0: "Rule Type", 1: "Source", 2: "Target",
3: "Object Class", 4: "Default Range"})

View File

@ -24,9 +24,9 @@ from setools.policyrep.exception import RuleUseError
from .models import SEToolsTableModel
class RBACRuleListModel(SEToolsTableModel):
class RBACRuleTableModel(SEToolsTableModel):
"""RBAC rule model. Represents rules as a column."""
"""A table-based model for RBAC rules."""
headers = defaultdict(str, {0: "Rule Type", 1: "Source", 2: "Target",
3: "Object Class", 4: "Default Role"})

View File

@ -24,9 +24,9 @@ from setools.policyrep.exception import RuleNotConditional, RuleUseError
from .models import SEToolsTableModel
class TERuleListModel(SEToolsTableModel):
class TERuleTableModel(SEToolsTableModel):
"""Type Enforcement rule model. Represents rules as a column."""
"""A table-based model for TE rules."""
headers = defaultdict(str, {0: "Rule Type", 1: "Source", 2: "Target",
3: "Object Class", 4: "Permissions/Default Type",