Merge remote-tracking branch 'github/dev' into dev

apps/assets/templates/assets/gateway_create_update.html

@@ -75,10 +75,10 @@ var port = '#' + '{{ form.port.id_for_label }}';
 
 function protocolChange() {
     if ($(protocol_id + " option:selected").text() === 'rdp') {
-        $(port).val(3389);
+        {#$(port).val(3389);#}
         $(private_key_id).closest('.form-group').addClass('hidden')
     } else {
-        $(port).val(22);
+        {#$(port).val(22);#}
         $(private_key_id).closest('.form-group').removeClass('hidden')
     }
 }

apps/assets/utils.py

@@ -54,7 +54,8 @@ def test_gateway_connectability(gateway):
     proxy.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 
     try:
-        proxy.connect(gateway.ip, username=gateway.username,
+        proxy.connect(gateway.ip, gateway.port,
+                      username=gateway.username,
                       password=gateway.password,
                       pkey=gateway.private_key_obj)
     except(paramiko.AuthenticationException,

apps/assets/views/domain.py

@@ -140,11 +140,6 @@ class DomainGatewayUpdateView(AdminUserRequiredMixin, UpdateView):
         domain = self.object.domain
         return reverse('assets:domain-gateway-list', kwargs={"pk": domain.id})
 
-    def form_valid(self, form):
-        response = super().form_valid(form)
-        print(form.cleaned_data)
-        return response
-
     def get_context_data(self, **kwargs):
         context = {
             'app': _('Assets'),

apps/users/templates/users/user_detail.html

@@ -421,8 +421,8 @@ $(document).ready(function() {
     APIUpdateAttr({ url: the_url, body: JSON.stringify(body), success: success, error: fail});
 }).on('click', '.btn-delete-user', function () {
     var $this = $(this);
-    var name = "{{ user.name }}";
-    var uid = "{{ user.id }}";
+    var name = "{{ user_object.name }}";
+    var uid = "{{ user_object.id }}";
     var the_url = '{% url "api-users:user-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
     var redirect_url = "{% url 'users:user-list' %}";
     objectDelete($this, name, the_url, redirect_url);

utils/make_migrations.sh

@@ -5,4 +5,4 @@ python3 ../apps/manage.py makemigrations
 
 python3 ../apps/manage.py migrate
 
-python3 ../apps/manage.py makemigrations –merge
+python3 ../apps/manage.py makemigrations –-merge