Now we don't ask dashboard for the same administered_orgs info twice

src/gui/main_window.py

@@ -107,7 +107,6 @@ def change_organization(self):
         self.network_dropdown.setEnabled(True)
         self.status.showMessage("Status: Fetching organizations...")
         # Change primary organization
-        selected_org = self.org_dropdown.currentText()
         """
         If the organization index of network_list is empty (i.e. this 
         network list for this org has never been updated), then get the
@@ -118,18 +117,6 @@ def change_organization(self):
         self.browser.set_active_org_index(selected_org_index)
         print("In change_organization and this is the network list "
               + str(self.browser.get_active_org_networks()))
-        # If we have network data for the selected org
-        selected_org_has_networks = self.browser.get_active_org_networks()
-        # [] == False, so any content means we have networks for that org
-        # If we've already scraped networks for that org, do nothing
-        if selected_org_has_networks:
-            print("we already have that info for " + selected_org +
-                  " at index" + str(selected_org_index))
-        else:
-            print("getting networks from change_organization")
-            print("we are getting new info for " + selected_org +
-                  " at index" + str(selected_org_index))
-            self.browser.set_active_org_index(selected_org_index)
 
         self.refresh_network_dropdown()
         self.status.showMessage("Status: In org " +

src/modules/dashboard_browser.py

@@ -411,12 +411,13 @@ def get_active_org_index(self):
     def set_active_org_index(self, org_index):
         """Set the the org index to the param."""
         self.active_org_id = list(self.orgs_dict)[org_index]
-        new_org_url = self.create_url_from_org_data()
-        self.browser.open(new_org_url)
-
-        new_org_dict = self.scrape_administered_orgs()[self.active_org_id]
-        filtered_org_dict = self.filter_org_data(new_org_dict, ['wired'])
-        self.orgs_dict[self.active_org_id] = filtered_org_dict
+        # If networks have not been retrieved for this org
+        if not self.orgs_dict[self.active_org_id]['node_groups']:
+            new_org_url = self.create_url_from_org_data()
+            self.browser.open(new_org_url)
+            new_org_dict = self.scrape_administered_orgs()[self.active_org_id]
+            filtered_org_dict = self.filter_org_data(new_org_dict, ['wired'])
+            self.orgs_dict[self.active_org_id] = filtered_org_dict
 
     def create_url_from_org_data(self):
         """Create the org url from administered_orgs data