more samba fixing

dirkules/samba/manager.py

@@ -29,6 +29,10 @@ def create_share(name, path, user, dir_mask, create_mask, writeable, btrfs, recy
     """
     share = SambaShare(name, path, btrfs=btrfs, recycle=recycling)
     user = SambaOption("valid users", user)
+    if dir_mask is None:
+        dir_mask = "0700"
+    if create_mask is None:
+        create_mask = "0600"
     dir_mask = SambaOption("directory mask", dir_mask)
     create_mask = SambaOption("create mask", create_mask)
     if writeable:

dirkules/samba/models.py

@@ -33,3 +33,8 @@ class SambaOption(db.Model):
     option = db.Column(db.String, nullable=False)
     value = db.Column(db.String, nullable=False)
 
+    def __init__(self, option, value):
+        self.option = option
+        self.value = value
+
+

dirkules/samba/templates/samba/index.html

@@ -25,7 +25,7 @@
             <thead>
             <tr>
                 <th>Name</th>
-                <th>Schreibzugriff</th>
+                <th>Pfad</th>
                 <th>Papierkorb</th>
                 <th>BtrFS Optimierungen</th>
             </tr>
@@ -35,8 +35,8 @@
             {% for share in shares %}
                 <tr>
                     <td>{{ share.name }}</td>
-                    <td>{{ share.writeable }}</td>
-                    <td>{{ share.recycling }}</td>
+                    <td>{{ share.path }}</td>
+                    <td>{{ share.recycle}}</td>
                     <td>{{ share.btrfs }}</td>
                 </tr>
 

dirkules/views.py

@@ -37,7 +37,7 @@ def drives():
             abort(500, description="Expected int, but got {}.".format(delete))
         except LookupError:
             abort(500, description="Invalid drive id {}".format(delete))
-
+        return redirect(url_for('drives'))
     return render_template('drives.html', drives=Drive.query.all())