setoolsgui: Missed symbol name attribute use.

This commit is contained in:
Chris PeBenito 2018-08-25 11:00:13 -04:00
parent 87f28f850f
commit d59b989e06
6 changed files with 14 additions and 14 deletions

View File

@ -39,7 +39,7 @@ class DefaultTableModel(SEToolsTableModel):
if col == 0: if col == 0:
return item.ruletype.name return item.ruletype.name
elif col == 1: elif col == 1:
return str(item.tclass) return item.tclass.name
elif col == 2: elif col == 2:
return item.default.name return item.default.name
elif col == 3: elif col == 3:

View File

@ -37,11 +37,11 @@ class MLSRuleTableModel(SEToolsTableModel):
if col == 0: if col == 0:
return rule.ruletype.name return rule.ruletype.name
elif col == 1: elif col == 1:
return str(rule.source) return rule.source.name
elif col == 2: elif col == 2:
return str(rule.target) return rule.target.name
elif col == 3: elif col == 3:
return str(rule.tclass) return rule.tclass.name
elif col == 4: elif col == 4:
return str(rule.default) return str(rule.default)

View File

@ -35,7 +35,7 @@ class NetifconTableModel(SEToolsTableModel):
if role == Qt.DisplayRole: if role == Qt.DisplayRole:
if col == 0: if col == 0:
return str(rule.netif) return rule.netif
elif col == 1: elif col == 1:
return str(rule.context) return str(rule.context)
elif col == 2: elif col == 2:

View File

@ -80,7 +80,7 @@ class ObjClassTableModel(SEToolsTableModel):
except NoCommon: except NoCommon:
com_perms = [] com_perms = []
return ", ".join(sorted(str(p) for p in chain(com_perms, item.perms))) return ", ".join(sorted(chain(com_perms, item.perms)))
elif role == Qt.UserRole: elif role == Qt.UserRole:
return item return item

View File

@ -38,19 +38,19 @@ class RBACRuleTableModel(SEToolsTableModel):
if col == 0: if col == 0:
return rule.ruletype.name return rule.ruletype.name
elif col == 1: elif col == 1:
return str(rule.source) return rule.source.name
elif col == 2: elif col == 2:
return str(rule.target) return rule.target.name
elif col == 3: elif col == 3:
try: try:
return str(rule.tclass) return rule.tclass.name
except RuleUseError: except RuleUseError:
# role allow # role allow
return None return None
elif col == 4: elif col == 4:
# next most common: default # next most common: default
try: try:
return str(rule.default) return rule.default.name
except RuleUseError: except RuleUseError:
return None return None

View File

@ -39,11 +39,11 @@ class TERuleTableModel(SEToolsTableModel):
if col == 0: if col == 0:
return rule.ruletype.name return rule.ruletype.name
elif col == 1: elif col == 1:
return str(rule.source) return rule.source.name
elif col == 2: elif col == 2:
return str(rule.target) return rule.target.name
elif col == 3: elif col == 3:
return str(rule.tclass) return rule.tclass.name
elif col == 4: elif col == 4:
try: try:
if rule.extended: if rule.extended:
@ -51,7 +51,7 @@ class TERuleTableModel(SEToolsTableModel):
else: else:
return ", ".join(sorted(rule.perms)) return ", ".join(sorted(rule.perms))
except RuleUseError: except RuleUseError:
return str(rule.default) return rule.default.name
elif col == 5: elif col == 5:
try: try:
return str(rule.conditional) return str(rule.conditional)