Merge branch 'trans_input_fix' into 'master'

Trans input fix

See merge request !403

circle/dashboard/static/dashboard/activity.js

@@ -41,12 +41,14 @@ $(function() {
         $('#confirmation-modal').on('hidden.bs.modal', function() {
         $('#confirmation-modal').on('hidden.bs.modal', function() {
           $('#confirmation-modal').remove();
           $('#confirmation-modal').remove();
         });
         });
+
         $('#vm-migrate-node-list li input:checked').closest('li').addClass('panel-primary');
         $('#vm-migrate-node-list li input:checked').closest('li').addClass('panel-primary');
       }
       }
     });
     });
     e.preventDefault();
     e.preventDefault();
   });
   });
 
 
+
   /* if the operation fails show the modal again */
   /* if the operation fails show the modal again */
   $("body").on("click", "#confirmation-modal #op-form-send", function() {
   $("body").on("click", "#confirmation-modal #op-form-send", function() {
     var url = $(this).closest("form").prop("action");
     var url = $(this).closest("form").prop("action");
@@ -237,4 +239,3 @@ String.prototype.hashCode = function() {
   }
   }
   return hash;
   return hash;
 };
 };
-

circle/dashboard/static/dashboard/dashboard.js

@@ -558,3 +558,5 @@ $(function() {
     inputs.prop("checked", !inputs.prop("checked"));
     inputs.prop("checked", !inputs.prop("checked"));
   });
   });
 });
 });
+
+$.fn.modal.Constructor.prototype.enforceFocus = function() {};

circle/dashboard/views/util.py

@@ -682,7 +682,7 @@ class TransferOwnershipConfirmView(LoginRequiredMixin, View):
             messages.error(request, _('This token is invalid or has expired.'))
             messages.error(request, _('This token is invalid or has expired.'))
             raise PermissionDenied()
             raise PermissionDenied()
         return render(request, self.template,
         return render(request, self.template,
-                      dictionary={'instance': instance, 'key': key})
+                      {'instance': instance, 'key': key})
 
 
     def change_owner(self, instance, new_owner):
     def change_owner(self, instance, new_owner):
         instance.owner = new_owner
         instance.owner = new_owner