Changeset 349

Timestamp:

07/08/10 22:47:45 (2 months ago)

Author:

nicholas

Message:

Adding loging routines.
Adding File model to track files, this will allow for permissions.

Location:

Python/file_manager/trunk/file_manager

Files:

• models.py (modified) (1 diff)
• utils.py (modified) (1 diff)

Python/file_manager/trunk/file_manager/models.py

@@ +1 @@
+from django.contrib.auth.models import User
 from django.db import models
+from django.utils.translation import ugettext as _
 #from django.contrib import admin
 
 class File(models.Model):
+    TYPES = (
+        ('S_IFSOCK', _('Socket')),
+        ('S_IFLNK', _('Symbolic link')),
+        ('S_IFREG', _('Regular file')),
+        ('S_IFBLK', _('Block device')),
+        ('S_IFDIR', _('Directory')),
+        ('S_IFCHR', _('Character device')),
+        ('S_IFIFO', _('FIFO')),
+    )
+
+    # Path is relative to settings.DOCUMENT_ROOT
+    path = models.TextField()
+    name = models.CharField(max_length=250)  
+    type = models.CharField(max_length=10, choices=TYPES)
+   
+    # 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 = (
-            ("can_create_file", "Can create file"),
-            ("can_update_file", "Can update file"),
-            ("can_copy_file", "Can copy file"),
-            ("can_upload_file", "Can upload file"),
-            ("can_delete_file", "Can delete file"),
-            ("can_rename_file", "Can rename file"),
-            ("can_move_file", "Can move file"),
+            ('can_create_file', _('Can create file')),
+            ('can_update_file', _('Can update file')),
+            ('can_copy_file', _('Can copy file')),
+            ('can_upload_file', _('Can upload file')),
+            ('can_delete_file', _('Can delete file')),
+            ('can_rename_file', _('Can rename file')),
+            ('can_move_file', _('Can move file')),
 
-            ('can_create_symlink', 'Can create symlink'),
-            ('can_copy_symlink', 'Can copy symlink'),
-            ('can_move_symlink', 'Can move symlink'),
-            ('can_rename_symlink', 'Can rename symlink'),
-            ('can_delete_symlink', 'Can delete symlink'),
+            ('can_create_symlink', _('Can create symlink')),
+            ('can_copy_symlink', _('Can copy symlink')),
+            ('can_move_symlink', _('Can move symlink')),
+            ('can_rename_symlink', _('Can rename symlink')),
+            ('can_delete_symlink', _('Can delete symlink')),
 
-            ("can_copy_dir", "Can copy directory"),
-            ("can_delete_dir", "Can delete directory"),
-            ("can_rename_dir", "Can rename directory"),
-            ("can_create_dir", "Can make directory"),
-            ("can_move_dir", "Can move directory"),
+            ('can_copy_dir', _('Can copy directory')),
+            ('can_delete_dir', _('Can delete directory')),
+            ('can_rename_dir', _('Can rename directory')),
+            ('can_create_dir', _('Can make directory')),
+            ('can_move_dir', _('Can move directory')),
+
+
         )

Python/file_manager/trunk/file_manager/utils.py

@@ -118 +118 @@
     return os.path.join(*rel_list)
 
+# From: django.contrib.admin.options
+def log_addition(request, object):
+    """
+    Log that an object has been successfully added.
+
+    The default implementation creates an admin LogEntry object.
+    """
+    from django.contrib.admin.models import LogEntry, ADDITION
+    LogEntry.objects.log_action(
+        user_id         = request.user.pk,
+        content_type_id = ContentType.objects.get_for_model(object).pk,
+        object_id       = object.pk,
+        object_repr     = force_unicode(object),
+        action_flag     = ADDITION
+    )
+
+# From: django.contrib.admin.options
+def log_change(request, object, message):
+    """
+    Log that an object has been successfully changed.
+
+    The default implementation creates an admin LogEntry object.
+    """
+    from django.contrib.admin.models import LogEntry, CHANGE
+    LogEntry.objects.log_action(
+        user_id         = request.user.pk,
+        content_type_id = ContentType.objects.get_for_model(object).pk,
+        object_id       = object.pk,
+        object_repr     = force_unicode(object),
+        action_flag     = CHANGE,
+        change_message  = message
+    )
+
+# From: django.contrib.admin.options
+def log_deletion(request, object, object_repr):
+    """
+    Log that an object has been successfully deleted. Note that since the
+    object is deleted, it might no longer be safe to call *any* methods
+    on the object, hence this method getting object_repr.
+
+    The default implementation creates an admin LogEntry object.
+    """
+    from django.contrib.admin.models import LogEntry, DELETION
+    from file_manager import models
+    LogEntry.objects.log_action(
+        user_id         = request.user.id,
+        content_type_id = ContentType.objects.get_for_model(models.File).pk,
+        object_id       = object.pk,
+        object_repr     = object_repr,
+        action_flag     = DELETION
+    )