Skip to content
Snippets Groups Projects
Commit fbcfae3d authored by inso's avatar inso
Browse files

Merge remote-tracking branch 'origin/vtexier' into dev

parents 32b996eb 994f82f2
No related branches found
No related tags found
No related merge requests found
...@@ -201,5 +201,8 @@ The process to join back the community later will have to be done again.""" ...@@ -201,5 +201,8 @@ The process to join back the community later will have to be done again."""
QMessageBox.Ok) QMessageBox.Ok)
def refresh_person(self, pubkey): def refresh_person(self, pubkey):
if self is None:
logging.error("community_tab self is None in refresh_person. Watcher connected to a destroyed tab")
else:
index = self.table_community_members.model().sourceModel().person_index(pubkey) index = self.table_community_members.model().sourceModel().person_index(pubkey)
self.table_community_members.model().sourceModel().dataChanged.emit(index[0], index[1]) self.table_community_members.model().sourceModel().dataChanged.emit(index[0], index[1])
...@@ -5,8 +5,7 @@ Created on 5 févr. 2014 ...@@ -5,8 +5,7 @@ Created on 5 févr. 2014
''' '''
import logging import logging
from ..core.person import Person from ..tools.exceptions import NoPeerAvailable
from ..tools.exceptions import PersonNotFoundError
from ..core.net.node import Node from ..core.net.node import Node
from PyQt5.QtCore import QAbstractTableModel, Qt, QVariant, QSortFilterProxyModel from PyQt5.QtCore import QAbstractTableModel, Qt, QVariant, QSortFilterProxyModel
from PyQt5.QtGui import QColor from PyQt5.QtGui import QColor
...@@ -52,7 +51,7 @@ class NetworkFilterProxyModel(QSortFilterProxyModel): ...@@ -52,7 +51,7 @@ class NetworkFilterProxyModel(QSortFilterProxyModel):
source_data = self.sourceModel().data(source_index, role) source_data = self.sourceModel().data(source_index, role)
if index.column() == self.sourceModel().column_types.index('is_member') \ if index.column() == self.sourceModel().column_types.index('is_member') \
and role == Qt.DisplayRole: and role == Qt.DisplayRole:
value = {True: 'yes', False: 'no'} value = {True: 'yes', False: 'no', None: 'offline'}
return value[source_data] return value[source_data]
return source_data return source_data
...@@ -100,7 +99,11 @@ class NetworkTableModel(QAbstractTableModel): ...@@ -100,7 +99,11 @@ class NetworkTableModel(QAbstractTableModel):
:param ..core.net.node.Node node: Network node :param ..core.net.node.Node node: Network node
:return: :return:
""" """
try:
is_member = node.pubkey in self.community.members_pubkeys() is_member = node.pubkey in self.community.members_pubkeys()
except NoPeerAvailable as e:
logging.error(e)
is_member = None
address = "" address = ""
if node.endpoint.server: if node.endpoint.server:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment