Merge pull request #62 from satnogs/dev

Merge for 0.7.3

db/base/admin.py

@@ -42,11 +42,15 @@ class SuggestionAdmin(admin.ModelAdmin):
 
     def approve_suggestion(self, request, queryset):
         for obj in queryset:
-            if obj.transmitter:
-                obj.uuid = obj.transmitter.uuid
-                obj.transmitter.delete()
-            obj.approved = True
-            obj.save()
+            try:
+                transmitter = Transmitter.objects.get(id=obj.transmitter.id)
+                transmitter.update_from_suggestion(obj)
+                obj.delete()
+            except (Transmitter.DoesNotExist, AttributeError):
+                obj.approved=True
+                obj.citation=''
+                obj.user=None
+                obj.save()
 
             # Notify user
             current_site = get_current_site(request)

db/base/models.py

@@ -70,6 +70,19 @@ class Transmitter(models.Model):
     def __unicode__(self):
         return self.description
 
+    def update_from_suggestion(self, suggestion):
+        self.description = suggestion.description
+        self.alive = suggestion.alive
+        self.downlink_low = suggestion.downlink_low
+        self.downlink_high = suggestion.downlink_high
+        self.uplink_low = suggestion.uplink_low
+        self.uplink_high = suggestion.uplink_high
+        self.mode = suggestion.mode
+        self.invert = suggestion.invert
+        self.baud = suggestion.baud
+        self.approved = True
+        self.save()
+
 
 class Suggestion(Transmitter):
     citation = models.CharField(max_length=255, blank=True)