Changeset 351

Timestamp:

07/10/10 09:39:35 (2 months ago)

Author:

nicholas

Message:

Adding csrf token to all forms. Added stubs for permissions and history
views.

Location:

Python/file_manager/trunk

Files:

• Changes (modified) (1 diff)
• file_manager/admin.py (modified) (1 diff)
• file_manager/bin (added)
• file_manager/bin/__init__.py (added)
• file_manager/bin/clean_database.py (added)
• file_manager/forms.py (modified) (1 diff)
• file_manager/models.py (modified) (3 diffs)
• file_manager/templates/admin/file_manager/copy.html (modified) (1 diff)
• file_manager/templates/admin/file_manager/create.html (modified) (1 diff)
• file_manager/templates/admin/file_manager/delete.html (modified) (1 diff)
• file_manager/templates/admin/file_manager/delete_selected.html (modified) (1 diff)
• file_manager/templates/admin/file_manager/index.html (modified) (1 diff)
• file_manager/templates/admin/file_manager/mkdir.html (modified) (1 diff)
• file_manager/templates/admin/file_manager/mkln.html (modified) (1 diff)
• file_manager/templates/admin/file_manager/move.html (modified) (1 diff)
• file_manager/templates/admin/file_manager/rename.html (modified) (1 diff)
• file_manager/templates/admin/file_manager/update.html (modified) (1 diff)
• file_manager/templates/admin/file_manager/upload.html (modified) (1 diff)
• file_manager/views.py (modified) (2 diffs)

Python/file_manager/trunk/Changes

@@ -12 +12 @@
   - Add ability to use settings.FILE_IGNORE_LIST that is a list of
         files or directories to ignore. (ie. .svn, .htaccess)
+  - Add {% csrf_token %} to forms.
 
 1.1.1 Fri Nov 20 21:47:56 CST 2009:

Python/file_manager/trunk/file_manager/admin.py

@@ -9 +9 @@
 
 class FileAdmin(admin.ModelAdmin):
+    """
+    This is only to get the File Manager to register itself into the
+    admin.
+    """
     def get_urls(self):
         urls = patterns('django.views.generic.simple',

Python/file_manager/trunk/file_manager/forms.py

@@ -154 +154 @@
     pass
 
+class PermissionForm(forms.Form):
+    pass
+
 class UploadForm(forms.Form):
 

Python/file_manager/trunk/file_manager/models.py

@@ -1 @@
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, Group, Permission
 from django.db import models
 from django.utils.translation import ugettext as _
-#from django.contrib import admin
 
 class File(models.Model):
@@ -15 +14 @@
     )
 
-    # Path is relative to settings.DOCUMENT_ROOT
+    # Path is relative to settings.DOCUMENT_ROOT and contains the full
+    # file name.
     path = models.TextField()
-    name = models.CharField(max_length=250)  
     type = models.CharField(max_length=10, choices=TYPES)
+    
+    permissions = models.ManyToManyField(FilePermission, verbose_name=_('file permissions'), blank=True)
    
-    # By default the person that created the file.
-    owner = models.ForeignKey(User) 
-
-    # How should permissions be handled?
-    # What can a non-owner do? What can they not do?
-    # How is that represented?
-
-    #permissions = models.ManyToManyField(Permission, verbose_name=_('file permissions'), blank=True)
-
     class Meta:
         permissions = (
+            # These are assigned to users.
             ('can_create_file', _('Can create file')),
             ('can_update_file', _('Can update file')),
@@ -51 +44 @@
             ('can_move_dir', _('Can move directory')),
 
+            # These are assigned to paths.
+            ('can_view', _('Can view')),
+            ('can_write', _('Can write')),
+            ('can_delete', _('Can delete')),
+            ('can_rename', _('Can rename')),
+            ('can_move', _('Can move')),
+        )
 
-        )
+class FilePermission(models.Model):
+    user = models.ForeignKey(User)
+    group = models.ForeignKey(Group)
+    permission = models.ForeignKey(Permission)

Python/file_manager/trunk/file_manager/templates/admin/file_manager/copy.html

@@ -32 +32 @@
 
 <form action="" method="POST">
+{% csrf_token %}
 <div>
 {% if form.errors %}

Python/file_manager/trunk/file_manager/templates/admin/file_manager/create.html

@@ -23 +23 @@
 <div id="content-main">
 <form action="" method="POST">
+{% csrf_token %}
 <div>
 {% if form.errors %}

Python/file_manager/trunk/file_manager/templates/admin/file_manager/delete.html

@@ -45 +45 @@
 
 <form action="" method="post">
+{% csrf_token %}
 <div>
     <input type="hidden" name="post" value="yes" />

Python/file_manager/trunk/file_manager/templates/admin/file_manager/delete_selected.html

@@ -44 +44 @@
 
 <form action="" method="post">
+{% csrf_token %}
 <div>
     <input type="hidden" name="action" value="delete_selected" />

Python/file_manager/trunk/file_manager/templates/admin/file_manager/index.html

@@ -74 +74 @@
         <div class="module" id="changelist">
         <form action="" method="post">
+        {% csrf_token %}
 
         <div class="actions">

Python/file_manager/trunk/file_manager/templates/admin/file_manager/mkdir.html

@@ -22 +22 @@
 
 <form action="" method="POST">
+{% csrf_token %}
 <div>
 {% if form.errors %}

Python/file_manager/trunk/file_manager/templates/admin/file_manager/mkln.html

@@ -22 +22 @@
 
 <form action="" method="POST">
+{% csrf_token %}
 <div>
 {% if form.errors %}

Python/file_manager/trunk/file_manager/templates/admin/file_manager/move.html

@@ -32 +32 @@
 
 <form action="" method="POST">
+{% csrf_token %}
 <div>
 {% if form.errors %}

Python/file_manager/trunk/file_manager/templates/admin/file_manager/rename.html

@@ -34 +34 @@
 
 <form action="" method="POST">
+{% csrf_token %}
 <div>
 {% if form.errors %}

Python/file_manager/trunk/file_manager/templates/admin/file_manager/update.html

@@ -32 +32 @@
 
 <form action="" method="POST">
+{% csrf_token %}
 <div>
 {% if form.errors %}

Python/file_manager/trunk/file_manager/templates/admin/file_manager/upload.html

@@ -25 +25 @@
 
 <form enctype="multipart/form-data" action="" method="POST">
+{% csrf_token %}
 <div>
 {% if form.errors %}

Python/file_manager/trunk/file_manager/views.py

@@ -80 +80 @@
                               context_instance=template.RequestContext(request))
 copy = staff_member_required(copy)
+
+def history(request, url=None):
+    pass
 
 #@staff_member_required
@@ -443 +446 @@
 move = staff_member_required(move)
 
+def permission(request, url=None):
+    pass
+
 #@staff_member_required
 def rename(request, url=None):