dashboard: fix some mass_ops issues

circle/common/models.py

@@ -501,9 +501,9 @@ def fetch_human_exception(exception, user=None):
         if isinstance(exception, PermissionDenied):
         if isinstance(exception, PermissionDenied):
             exception = create_readable(ugettext_noop("Permission Denied"))
             exception = create_readable(ugettext_noop("Permission Denied"))
         else:
         else:
-            exception = create_readable(
-                _("Unknown error"), _("Unknown error: %(ex)s"),
-                ex=unicode(exception)).get_text()
+            exception = create_readable(ugettext_noop("Unknown error"),
+                                        ugettext_noop("Unknown error: %(ex)s"),
+                                        ex=unicode(exception))
     return exception.get_text(user) if user else exception
     return exception.get_text(user) if user else exception
 
 
 
 

circle/dashboard/templates/dashboard/_vm-mass-migrate.html

@@ -13,7 +13,7 @@
         </label>
         </label>
         <input id="migrate-to-none" type="radio" name="node" value="" style="float: right;" checked="checked">
         <input id="migrate-to-none" type="radio" name="node" value="" style="float: right;" checked="checked">
         <span class="vm-migrate-node-property">
         <span class="vm-migrate-node-property">
-          {% trans "This option will reschedule each virtual machine to the most optimal node." %}
+          {% trans "This option will reschedule each virtual machine to the optimal node." %}
         </span>
         </span>
         <div style="clear: both;"></div>
         <div style="clear: both;"></div>
       </div>
       </div>

circle/dashboard/views.py

@@ -1025,6 +1025,7 @@ class MassOperationView(OperationView):
     template_name = 'dashboard/mass-operate.html'
     template_name = 'dashboard/mass-operate.html'
 
 
     def check_auth(self):
     def check_auth(self):
+        self.get_op().check_perms(self.request.user)
         for i in self.get_object():
         for i in self.get_object():
             if not i.has_level(self.request.user, "user"):
             if not i.has_level(self.request.user, "user"):
                 raise PermissionDenied(
                 raise PermissionDenied(
@@ -1100,7 +1101,7 @@ class MassOperationView(OperationView):
             store.used = True
             store.used = True
             return HttpResponse(
             return HttpResponse(
                 json.dumps({'messages': [unicode(m) for m in store]}),
                 json.dumps({'messages': [unicode(m) for m in store]}),
-                content_type="application=json"
+                content_type="application/json"
             )
             )
         else:
         else:
             return redirect(reverse("dashboard.views.vm-list"))
             return redirect(reverse("dashboard.views.vm-list"))