Merge branch 'master' of git.rackster.ch:ipynbsrv/ipynbsrv

coco-project · Aug 11, 2015 · 5e51859 · 5e51859
2 parents 3f23fc0 + 4dee0f7
commit 5e51859
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/ipynbsrv/core/models.py b/ipynbsrv/core/models.py
@@ -776,7 +776,7 @@ class ContainerImage(models.Model):
         max_length=75,
         validators=[
             RegexValidator(
-                regex='^[A-z][\w\/]*$',
+                regex='^[A-z][\w\/-]*$',
                 message='Invalid container snapshot name.'
             )
         ]

diff --git a/ipynbsrv/web/templates/web/container_snapshots/modal_create.html b/ipynbsrv/web/templates/web/container_snapshots/modal_create.html
@@ -13,8 +13,8 @@ <h4 class="modal-title">New Container Snapshot</h4>
                     <input name="ct_id" type="hidden" class="form-control" value="{{ container.id }}">
                     <div class="form-group">
                         <label for="name">Name</label>
-                        <input name="name" type="text" pattern="[A-Za-z1-9_-]+" class="form-control" required>
-                        <p class="help-text">Allowed pattern: ^[A-z]\w*$</p>
+                        <input name="name" type="text" pattern="^[A-z]\w*$" class="form-control" required>
+                        <p class="help-block">Allowed pattern: ^[A-z]\w*$</p>
                     </div>
                     <div class="form-group">
                         <label for="description">Description</label>

diff --git a/ipynbsrv/web/templates/web/containers/modal_create.html b/ipynbsrv/web/templates/web/containers/modal_create.html
@@ -12,7 +12,8 @@ <h4 class="modal-title">New container</h4>
                  <div class="modal-body">
                     <div class="form-group">
                         <label for="name">Name</label>
-                        <input name="name" type="text" pattern="[A-Za-z1-9_-]+" class="form-control" placeholder="e.g IPython Notebook" required>
+                        <input name="name" type="text" pattern="^[A-z]\w*$" class="form-control" placeholder="e.g IPython Notebook" required>
+                        <p class="help-block">Allowed pattern: ^[A-z]\w*$</p>
                     </div>
                     <div class="form-group">
                         <label for="description">Description</label>

diff --git a/ipynbsrv/web/templates/web/images/modal_create.html b/ipynbsrv/web/templates/web/images/modal_create.html
@@ -23,8 +23,8 @@ <h4 class="modal-title">New image</h4>
                     </div>
                     <div class="form-group">
                         <label for="img_name">Name</label>
-                        <input name="img_name" type="text" pattern="[A-Za-z1-9_-]+" class="form-control" placeholder="e.g fhnw-maths " required>
-                        <p class="help-text">Allowed pattern: ^[A-z][\w\/]*$</p>
+                        <input name="img_name" type="text" pattern="^[A-z][\w\/]*$" class="form-control" placeholder="e.g fhnw-maths " required>
+                        <p class="help-block">Allowed pattern: ^[A-z][\w\/]*$</p>
                     </div>
                     <div class="form-group">
                         <label for="description">Description</label>