Guba Sándor · @gubasandor · Őry Máté · Őry Máté · Őry Máté · Őry Máté
--- a/circle/dashboard/forms.py
+++ b/circle/dashboard/forms.py
        return super(UserKeyForm, self).clean()
  
  
+class ConnectCommandForm(forms.ModelForm):
+    class Meta:
+        fields = ('name', 'access_method', 'template')
+        model = ConnectCommand
+
+    @property
+    def helper(self):
+        helper = FormHelper()
+        helper.add_input(Submit("submit", _("Save")))
+        return helper
+
+    def __init__(self, *args, **kwargs):
+        self.user = kwargs.pop("user", None)
--- a/circle/dashboard/models.py
+++ b/circle/dashboard/models.py
+class ConnectCommand(Model):
+    user = ForeignKey(User, related_name='command_set')
+    access_method = CharField(max_length=10, choices=ACCESS_METHODS,
+                              verbose_name=_('access method'),
+                              help_text=_('Type of the remote access method.'))
+    name = CharField(max_length="128", verbose_name=_('name'), blank=False,
+                     help_text=_("Name of your custom command."))
+    template = CharField(blank=True, null=True, max_length=256,
+                         verbose_name=_('command template'),
+                         help_text=_('Template for connection command string. '
+                                     'Available parameters are: '
+                                     'username, password, '
+                                     'host, port, app. Example: sshpass '
+                                     '-p %(password)s ssh -o '
+                                     'StrictHostKeyChecking=no %(username)s@'
+                                     '%(host)s -p %(port)s'))
--- a/circle/dashboard/models.py
+++ b/circle/dashboard/models.py
+    def get_connect_commands(self, instance, use_ipv6=False):
+        """ Generate connection command based on template."""
+        single_command = instance.get_connect_command(use_ipv6)
+        if single_command:  # can we even connect to that VM
+            commands = self.user.command_set.filter(
+                access_method=instance.access_method)
+            if commands.count() < 1:
+                return [single_command]
+            else:
+                return [
+                    command.template % {
+                        'port': instance.get_connect_port(use_ipv6=use_ipv6),
+                        'host':  instance.get_connect_host(use_ipv6=use_ipv6),
+                        'password': instance.pw,
+                        'username': 'cloud',
+                    } for command in commands]
--- a/circle/dashboard/tables.py
+++ b/circle/dashboard/tables.py
+    )
+    actions = TemplateColumn(
+        verbose_name=_("Actions"),
+        template_name=("dashboard/connect-command-list/column-command"
+                       "-actions.html"),
+        orderable=False,
+    )
+
+    class Meta:
+        model = ConnectCommand
+        attrs = {'class': ('table table-bordered table-striped table-hover'),
+                 'id': "profile-command-list-table"}
+        fields = ('name', 'access_method',  'template', 'actions')
+        prefix = "cmd-"
+        empty_text = _("You don't have any custom connection string, the "
+                       "default ones will be used.")
--- a/circle/dashboard/templates/dashboard/connect-command-edit.html
+++ b/circle/dashboard/templates/dashboard/connect-command-edit.html
+{% extends "dashboard/base.html" %}
+{% load i18n %}
+{% load sizefieldtags %}