Refactor forms and views for federated site management; add site_id to URL context

Author: Rutvikrj26

physionet-django/console/forms.py

@@ -1088,11 +1088,11 @@ def __init__(self, *args, **kwargs):
     def clean_site_identifier(self):
         from search.models import FederatedSite
         site_identifier = self.cleaned_data['site_identifier']
-        
+
         # If editing, allow the current identifier
         if self.site_instance and self.site_instance.site_identifier == site_identifier:
             return site_identifier
-            
+
         # Check if identifier already exists
         if FederatedSite.objects.filter(site_identifier=site_identifier).exists():
             raise forms.ValidationError('A site with this identifier already exists.')

physionet-django/console/urls.py

@@ -199,6 +199,7 @@
     'news_slug': 'cloud-migration',
     'version': '1.0',
     'training_slug': 'world-101-introduction-to-continents-and-countries',
+    'site_id': 1,
 }
 TEST_CASES = {
     'published_projects_by_slug': {

physionet-django/console/views.py

@@ -3717,9 +3717,9 @@ def federated_sites(request):
     List all federated sites with their sync status
     """
     from search.models import FederatedSite, FederationSyncLog
-    
+
     sites = FederatedSite.objects.all().order_by('site_name')
-    
+
     # Get latest sync log for each site
     sites_with_logs = []
     for site in sites:
@@ -3728,7 +3728,7 @@ def federated_sites(request):
             'site': site,
             'latest_log': latest_log,
         })
-    
+
     return render(request, 'console/federated_sites.html', {
         'sites_with_logs': sites_with_logs,
     })
@@ -3740,7 +3740,7 @@ def federated_site_add(request):
     Add a new federated site
     """
     from search.models import FederatedSite
-    
+
     if request.method == 'POST':
         form = forms.FederatedSiteForm(request.POST)
         if form.is_valid():
@@ -3759,7 +3759,7 @@ def federated_site_add(request):
                     messages.error(request, error)
     else:
         form = forms.FederatedSiteForm()
-    
+
     return render(request, 'console/federated_site_form.html', {
         'form': form,
         'action': 'Add',
@@ -3772,9 +3772,9 @@ def federated_site_edit(request, site_id):
     Edit an existing federated site
     """
     from search.models import FederatedSite
-    
+
     site = get_object_or_404(FederatedSite, id=site_id)
-    
+
     if request.method == 'POST':
         form = forms.FederatedSiteForm(request.POST, instance=site)
         if form.is_valid():
@@ -3791,7 +3791,7 @@ def federated_site_edit(request, site_id):
                     messages.error(request, error)
     else:
         form = forms.FederatedSiteForm(instance=site)
-    
+
     return render(request, 'console/federated_site_form.html', {
         'form': form,
         'site': site,
@@ -3804,8 +3804,9 @@ def federated_site_detail(request, site_id):
     """
     View details of a federated site including sync history
     """
+
     from search.models import FederatedSite
-    
+
     site = get_object_or_404(FederatedSite, id=site_id)
 
     # Get sync logs for this site

physionet-django/search/views.py

@@ -253,7 +253,7 @@ def content_index(request, resource_type=None):
     # Get federated projects
     federated_projects = get_federated_projects(resource_type=resource_type,
                                                 search_term=topic)
-    
+
     # Sort federated projects
     if orderby == 'publish_datetime':
         fed_order = 'publish_datetime' if direction == 'asc' else '-publish_datetime'
@@ -267,19 +267,19 @@ def content_index(request, resource_type=None):
     else:
         # Default to publish_datetime for relevance sorting
         federated_projects = federated_projects.order_by('-publish_datetime')
-    
+
     # Add flag to distinguish federated projects in template
     # Convert to lists
     local_projects_list = list(published_projects)
     federated_projects_list = list(federated_projects)
-    
+
     # Mark federated projects with a flag
     for project in federated_projects_list:
         project.is_federated = True
-    
+
     # Combine both lists
     all_projects = local_projects_list + federated_projects_list
-    
+
     # Apply custom sorting if needed for combined results
     if orderby == 'publish_datetime':
         all_projects.sort(key=lambda p: p.publish_datetime, reverse=(direction == 'desc'))