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

coco-project · Aug 11, 2015 · 77a4527 · 77a4527
2 parents 48a93f8 + 09a2e9b
commit 77a4527
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/docs/user-guide/mkdocs.yml b/docs/user-guide/mkdocs.yml
@@ -1,8 +1,7 @@
 site_name: User Guide
-theme: readthedocs
 
 docs_dir: .
-site_dir: ../../ipynbsrv/wui/static/docs/user-guide
+site_dir: ../../ipynbsrv/web/static/docs/user-guide
 
 pages:
-- [index.md, Home]
+- 'Home' : 'index.md'
diff --git a/ipynbsrv/core/models.py b/ipynbsrv/core/models.py
@@ -772,7 +772,15 @@ class ContainerImage(models.Model):
         max_length=255,
         help_text='The primary key the backend uses to identify this image.'
     )
-    name = models.CharField(max_length=75)
+    name = models.CharField(
+        max_length=75,
+        validators=[
+            RegexValidator(
+                regex='^[A-z][\w\/]*$',
+                message='Invalid container snapshot name.'
+            )
+        ]
+    )
     description = models.TextField(blank=True, null=True)
     # TODO: document placeholders
     command = models.CharField(

diff --git a/ipynbsrv/web/templates/web/container_snapshots/modal_create.html b/ipynbsrv/web/templates/web/container_snapshots/modal_create.html
@@ -14,6 +14,7 @@ <h4 class="modal-title">New Container Snapshot</h4>
                     <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>
                     </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
@@ -22,6 +22,7 @@ <h4 class="modal-title">New image</h4>
                     <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>
                     </div>
                     <div class="form-group">
                         <label for="description">Description</label>

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