test commit

This commit is contained in:
Sanj 2011-12-11 12:31:51 +05:30
parent fa52e53956
commit 45a06ca96f
2 changed files with 2 additions and 1 deletions

View File

@ -232,7 +232,7 @@ class File(models.Model):
class Category(models.Model): class Category(models.Model):
name = models.CharField(max_length=255) name = models.CharField(max_length=255)
groups = models.ManyToManyField(Group, null=True) groups = models.ManyToManyField(Group, null=True)
# descriotion = models.TextField(blank=True) # description = models.TextField(blank=True)
# folder_name = models.CharField(max_length=512) # folder_name = models.CharField(max_length=512)
def __unicode__(self): def __unicode__(self):

View File

@ -243,6 +243,7 @@ var Canvas = function(opts, json) {
if (typeof json != 'undefined') { if (typeof json != 'undefined') {
this.loadFromJSON(json); this.loadFromJSON(json);
} else { } else {
$.noop();
} }
return this; return this;