Hide extension.endpoint_id display for now

[ipypbx] / src / ipypbx / controllers.py

diff --git a/src/ipypbx/controllers.py b/src/ipypbx/controllers.py
index 43d7322..2063db9 100644 (file)
--- a/src/ipypbx/controllers.py
+++ b/src/ipypbx/controllers.py
@@ -195,7 +195,9 @@ class BaseController(QtCore.QObject):
         """
         Save to database.
         """
+        index = self.view_list.currentIndex()
         self.view_display.submit()
+        self.view_list.setCurrentIndex(index)
         self.getFieldWidget('Add').setEnabled(True)
 
 
@@ -216,9 +218,6 @@ class ConnectionController(BaseController):
     def __init__(self, parent=None, views=None):
         super(ConnectionController, self).__init__(parent, views)
 
-        # We track last selected row because Qt deselects in on submit.
-        self.last_row = -1
-
         for row in range(self.model.rowCount()):
             # Get local IP address and port from the table for each row.
             server = http.FreeswitchConfigServer(self)
@@ -238,17 +237,16 @@ class ConnectionController(BaseController):
     def connectionChange(self, index):
         """
         Restart config server on connection change if necessary.
-        """        
+        """
         current_row = index.row()
         if current_row != -1:
-            self.last_row = current_row
             # Select the new row.
             connection_id, _ok = index.model().data(
-                index.sibling(index.row(), 0)).toInt()
+                index.sibling(current_row, 0)).toInt()
 
-        # Apply new socket location.
-        self.servers[self.last_row].setSocketData(
-            *self.getSocketData(self.last_row))
+            # Apply new socket location.
+            self.servers[current_row].setSocketData(
+                *self.getSocketData(current_row))
         
     def objectAdded(self, row, record):
         """
@@ -265,10 +263,6 @@ class ConnectionController(BaseController):
         server.startServer()
         self.servers.append(server)
 
-    def save(self):
-        super(ConnectionController, self).save()
-        self.view_list.selectRow(self.last_row)
-
 
 class ConnectionChangeListenerController(BaseController):
     """
@@ -281,7 +275,9 @@ class ConnectionChangeListenerController(BaseController):
         Filters table by a new connection ID and stores last connection ID
         locally.
         """
-        if index.row() != -1:
+        index_row = index.row()
+        if index_row != -1:
+            # Get connection_id field value.
             connection_id, _ok = index.model().data(
                 index.sibling(index.row(), 0)).toInt()
             self.connection_id = connection_id
@@ -391,9 +387,11 @@ class ExtensionController(ConnectionChangeListenerController):
         QtCore.QT_TRANSLATE_NOOP('MainWindow', 'Authenticate Calls'),
         QtCore.QT_TRANSLATE_NOOP('MainWindow', 'Is Active'))
     view_list_fields = 'Destination Match',
+    view_display_fields_hidden = 'ID', 'Connection ID', 'Endpoint ID'
     relations = (
         ('domain_id', 'Domain ID', 'domain', 'host_name'),
-        ('endpoint_id', 'Endpoint ID', 'endpoint', 'user_id'))
+#        ('endpoint_id', 'Endpoint ID', 'endpoint', 'user_id'),
+        )
         
     def objectAdded(self, row, record):
         record.setValue(