Resolved conflict in .gitignore

.gitignore

@@ -69,3 +69,8 @@ local.properties
 # ignore any specific conf files, execept the default one
 django/comic/settings/*.conf
 !django/comic/settings/00_default.conf
+
+# Ignore intellij stuff
+*.iml
+**/.idea
+

django/ckeditor/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns(
     '',

django/comicmodels/migrations/0008_add_view_perms_to_uploadedfile.py

@@ -5,44 +5,44 @@
 from south.db import db
 from south.v2 import DataMigration
 from django.db import models
-from guardian.shortcuts import assign
+from guardian.shortcuts import assign_perm
 from django.contrib.auth.models import Group
 from django.core.management import call_command
 
 
 class Migration(DataMigration):
-    
-    # run this first because adding user 'anonymousUser' in 
-    # fixtures/user_everyone.json requires it    
+
+    # run this first because adding user 'anonymousUser' in
+    # fixtures/user_everyone.json requires it
     depends_on = (
              ("profiles", "0002_auto__add_field_userprofile_country"),
     )
-    
+
     def forwards(self, orm):
         "Write your forwards methods here."
         # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..."
         permission = 'view_ComicSiteModel'
-        
-                
+
+
         if not db.dry_run:
             print "Everyone should be able to see uploaded files by default for now. giving\
                   '"+permission+"' permission to 'everyone' user for the following UploadModel\
                   instances: "
-                  
-            #create the 'everyone' user in database                  
+
+            #create the 'everyone' user in database
             call_command("loaddata", "../fixtures/user_everyone.json")
-                        
+
             everyonegroup = orm['auth.Group'].objects.get(name="everyone")
             evg = Group.objects.get(name="everyone")
             # For permissions to work properly after migrating
-            for uploadmodel in orm['comicmodels.UploadModel'].objects.all():                
-                assign(permission,evg,uploadmodel)
-                
+            for uploadmodel in orm['comicmodels.UploadModel'].objects.all():
+                assign_perm(permission,evg,uploadmodel)
+
                 print uploadmodel.file
                 #uploadmodel.setpermissions(uploadmodel.ALL)
-                
-            
-        
+
+
+
 
     def backwards(self, orm):
         "Write your backwards methods here."
@@ -111,7 +111,7 @@ def backwards(self, orm):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'permission_lvl': ('django.db.models.fields.CharField', [], {'default': "'ALL'", 'max_length': '3'}),
             'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'})
-        
+
         },
         'contenttypes.contenttype': {
             'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},

django/comicmodels/migrations/0025_add_RegistrationRequest_permissions.py

@@ -3,9 +3,9 @@
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from guardian.shortcuts import assign 
+from guardian.shortcuts import assign_perm
 from django.contrib.auth.models import Group,Permission
- 
+
 
 
 class Migration(SchemaMigration):
@@ -15,51 +15,51 @@ def forwards(self, orm):
             # some object classes can only be seen by root, like all users for
             # instance. Add the new object class RegistrationRequest to the group
             # which all project admins are part of, so they don't get a 403 forbidden
-            # when trying to see requests for their project 
-                                    
-            try:                                                               
+            # when trying to see requests for their project
+
+            try:
                 projectadmins = Group.objects.get(name="projectadmins")
-            except Group.DoesNotExist as e:                            
+            except Group.DoesNotExist as e:
                 projectadmins = Group(name='projectadmins')
                 #TODO add permissions for all comicmodels and registrationRequest
                 projectadmins.save()
-                 
+
             # my god spent 2 hours on this line. But this fixes any issues with
             # default permissions for registrationrequest not being found..
             db.send_pending_create_signals()
-                        
+
             # each user in comic is part of this group projectadmins. With the
             # permission in this group you can determine which types of objects
             # regular adins can see and edit in the admin interface.
-                
+
             self.add_standard_perms("comicmodels","registrationrequest",projectadmins)
             self.add_standard_perms("comicmodels","comicsite",projectadmins)
-            self.add_standard_perms("comicmodels","page",projectadmins)                                    
-            
-    
+            self.add_standard_perms("comicmodels","page",projectadmins)
+
+
     def add_standard_perms(self,appname,modelname,group):
 
         self.assign_once("{0}.add_{1}".format(appname,modelname),group)
         self.assign_once("{0}.change_{1}".format(appname,modelname),group)
         self.assign_once("{0}.delete_{1}".format(appname,modelname),group)
-        
-    
+
+
     def assign_once(self,perm,group):
         """ Assign perm to group if it did not have it already. This fixes erros
         with double permissions after migrations
-        
-        """        
-        if not self.has_perm(group,perm):                            
-            assign(perm,group)
-
 
-
+        """
+        if not self.has_perm(group,perm):
+            assign_perm(perm,group)
+
+
+
     def has_perm(self,group,perm):
         """ Could not find this function in guardian.shortcuts so making it here
         Does group have permission perm assigned to it?
-        
-        Raises ValueError if perm is not in 'appname.codename' format 
-        """        
+
+        Raises ValueError if perm is not in 'appname.codename' format
+        """
         try:
             app_label, codename = perm.split('.', 1)
         except ValueError:
@@ -70,9 +70,9 @@ def has_perm(self,group,perm):
             return True
         else:
             return False
-        
-    
-                         
+
+
+
     def backwards(self, orm):
         pass