test commit
This commit is contained in:
parent
fa52e53956
commit
45a06ca96f
|
@ -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):
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user