Added "metatypes" field to some tables in models

28 files changed, 81 insertions, 31 deletions

diff --git a/gstudio/admin/attribute.py b/gstudio/admin/attribute.py
index babc9de6..ed9c436a 100644
--- a/gstudio/admin/attribute.py
+++ b/gstudio/admin/attribute.py
@@ -16,12 +16,11 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeAdmin(parent_class):
-    fieldsets=((_('Attribute'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope')}),
+    fieldsets=((_('Attribute'),{'fields': ('metatypes','subject','attributetype','attributetype_scope','subject_scope','svalue','value_scope')}),
 
 )
     
     
-
     class Media:
         js = ("gstudio/js/gstudio.js",)
     
diff --git a/gstudio/admin/attribute_bigintegerfield.py b/gstudio/admin/attribute_bigintegerfield.py
index 6e0938cb..0707cf87 100644
--- a/gstudio/admin/attribute_bigintegerfield.py
+++ b/gstudio/admin/attribute_bigintegerfield.py
@@ -12,7 +12,7 @@ else:
    parent_class = admin.ModelAdmin
 class AttributeBigIntegerFieldAdmin(parent_class):
 
-   fieldsets=((_('AttributeBigIntegerField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+   fieldsets=((_('AttributeBigIntegerField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
    prepopulated_fields = {'svalue': ('value', )} 
diff --git a/gstudio/admin/attribute_booleanfield.py b/gstudio/admin/attribute_booleanfield.py
index e5d29fed..d2d64cae 100644
--- a/gstudio/admin/attribute_booleanfield.py
+++ b/gstudio/admin/attribute_booleanfield.py
@@ -15,6 +15,6 @@ class AttributeBooleanFieldAdmin(parent_class):
 )
     prepopulated_fields = {'svalue': ('value',)} 
     def save_model(self, request, attributebooleanfield, form, change):
-    	attributebigintegerfield.title = attributeboofield.composed_sentence
-        attributebigintegerfield.slug =   slugify(attributebigintegerfield.title)
-        attributebigintegerfield.save()
+    	attributebooleanfield.title = attributebooleanfield.composed_sentence
+        attributebooleanfield.slug =   slugify(attributebooleanfield.title)
+        attributebooleanfield.save()
diff --git a/gstudio/admin/attribute_charfield.py b/gstudio/admin/attribute_charfield.py
index afa41b7d..281e806f 100644
--- a/gstudio/admin/attribute_charfield.py
+++ b/gstudio/admin/attribute_charfield.py
@@ -11,7 +11,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeCharFieldAdmin(parent_class):
-    fieldsets=((_('AttributeCharField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributeCharField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
     prepopulated_fields = {'svalue': ('value',)} 
diff --git a/gstudio/admin/attribute_commaseparatedintegerfield.py b/gstudio/admin/attribute_commaseparatedintegerfield.py
index b09d4d40..77ea7281 100644
--- a/gstudio/admin/attribute_commaseparatedintegerfield.py
+++ b/gstudio/admin/attribute_commaseparatedintegerfield.py
@@ -11,7 +11,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeCommaSeparatedIntegerFieldAdmin(parent_class):
-    fieldsets=((_('AttributeCommaSeparatedIntegerField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributeCommaSeparatedIntegerField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
     prepopulated_fields = {'svalue': ('value',)}  
diff --git a/gstudio/admin/attribute_datefield.py b/gstudio/admin/attribute_datefield.py
index 2856d23e..7b7b8a87 100644
--- a/gstudio/admin/attribute_datefield.py
+++ b/gstudio/admin/attribute_datefield.py
@@ -11,7 +11,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeDateFieldAdmin(parent_class):
-    fieldsets=((_('AttributeDateField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributeDateField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
     prepopulated_fields = {'svalue': ('value',)} 
diff --git a/gstudio/admin/attribute_datetimefield.py b/gstudio/admin/attribute_datetimefield.py
index e4de8b9d..f64b2933 100644
--- a/gstudio/admin/attribute_datetimefield.py
+++ b/gstudio/admin/attribute_datetimefield.py
@@ -11,7 +11,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeDateTimeFieldAdmin(parent_class):
-    fieldsets=((_('AttributeDateTimeField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributeDateTimeField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
     prepopulated_fields = {'svalue': ('value', )}
diff --git a/gstudio/admin/attribute_decimalfield.py b/gstudio/admin/attribute_decimalfield.py
index b32c760c..6925b5af 100644
--- a/gstudio/admin/attribute_decimalfield.py
+++ b/gstudio/admin/attribute_decimalfield.py
@@ -11,7 +11,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeDecimalFieldAdmin(parent_class):
-    fieldsets=((_('AttributeDecimalField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributeDecimalField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
     prepopulated_fields = {'svalue': ('value',)}  
diff --git a/gstudio/admin/attribute_emailfield.py b/gstudio/admin/attribute_emailfield.py
index 5fe1af91..e4fdd9cd 100644
--- a/gstudio/admin/attribute_emailfield.py
+++ b/gstudio/admin/attribute_emailfield.py
@@ -11,7 +11,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeEmailFieldAdmin(parent_class):
-    fieldsets=((_('AttributEmailField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributEmailField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
     prepopulated_fields = {'svalue': ('value', )}
diff --git a/gstudio/admin/attribute_filefield.py b/gstudio/admin/attribute_filefield.py
index 61a34973..6f22f28f 100644
--- a/gstudio/admin/attribute_filefield.py
+++ b/gstudio/admin/attribute_filefield.py
@@ -11,7 +11,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeFileFieldAdmin(parent_class):
-    fieldsets=((_('AttributeFileField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributeFileField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
     prepopulated_fields = {'svalue': ('value', )}
diff --git a/gstudio/admin/attribute_filepathfield.py b/gstudio/admin/attribute_filepathfield.py
index cf570a74..d230984f 100644
--- a/gstudio/admin/attribute_filepathfield.py
+++ b/gstudio/admin/attribute_filepathfield.py
@@ -10,7 +10,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeFilePathFieldAdmin(parent_class):
-    fieldsets=((_('AttributeFilePathField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributeFilePathField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
     prepopulated_fields = {'svalue': ('value', )}
diff --git a/gstudio/admin/attribute_floatfield.py b/gstudio/admin/attribute_floatfield.py
index 23ab024d..2c10b415 100644
--- a/gstudio/admin/attribute_floatfield.py
+++ b/gstudio/admin/attribute_floatfield.py
@@ -11,7 +11,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeFloatFieldAdmin(parent_class):
-    fieldsets=((_('AttributeFloatField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributeFloatField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
     prepopulated_fields = {'svalue': ('value', )}
diff --git a/gstudio/admin/attribute_imagefield.py b/gstudio/admin/attribute_imagefield.py
index c2005098..e6be93ee 100644
--- a/gstudio/admin/attribute_imagefield.py
+++ b/gstudio/admin/attribute_imagefield.py
@@ -11,7 +11,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeImageFieldAdmin(parent_class):
-    fieldsets=((_('AttributeImageField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributeImageField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 ) 
     prepopulated_fields = {'svalue': ('value', )}
diff --git a/gstudio/admin/attribute_integerfield.py b/gstudio/admin/attribute_integerfield.py
index bfc84598..aef38321 100644
--- a/gstudio/admin/attribute_integerfield.py
+++ b/gstudio/admin/attribute_integerfield.py
@@ -12,7 +12,7 @@ else:
 
 
 class AttributeIntegerFieldAdmin(parent_class):
-    fieldsets=((_('AttributIntegerField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributIntegerField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
     prepopulated_fields = {'svalue': ('value', )}
diff --git a/gstudio/admin/attribute_ipaddressfield.py b/gstudio/admin/attribute_ipaddressfield.py
index 08569661..396ede6d 100644
--- a/gstudio/admin/attribute_ipaddressfield.py
+++ b/gstudio/admin/attribute_ipaddressfield.py
@@ -11,7 +11,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeIPAddressFieldAdmin(parent_class):
-    fieldsets=((_('AttributeIPAddressField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributeIPAddressField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
     prepopulated_fields = {'svalue': ('value', )}  
diff --git a/gstudio/admin/attribute_nullbooleanfield.py b/gstudio/admin/attribute_nullbooleanfield.py
index 279677d6..ff8f8791 100644
--- a/gstudio/admin/attribute_nullbooleanfield.py
+++ b/gstudio/admin/attribute_nullbooleanfield.py
@@ -11,7 +11,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeNullBooleanFieldAdmin(parent_class):
-    fieldsets=((_('AttributeNullBooleanField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributeNullBooleanField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
     prepopulated_fields = {'svalue': ('value', )} 
diff --git a/gstudio/admin/attribute_positiveintegerfield.py b/gstudio/admin/attribute_positiveintegerfield.py
index 67bbbf60..f9635589 100644
--- a/gstudio/admin/attribute_positiveintegerfield.py
+++ b/gstudio/admin/attribute_positiveintegerfield.py
@@ -11,7 +11,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributePositiveIntegerFieldAdmin(parent_class):
-    fieldsets=((_('AttributePositiveIntegerField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributePositiveIntegerField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
     prepopulated_fields = {'svalue': ('value', )} 
diff --git a/gstudio/admin/attribute_textfield.py b/gstudio/admin/attribute_textfield.py
index 3501668c..755c5827 100644
--- a/gstudio/admin/attribute_textfield.py
+++ b/gstudio/admin/attribute_textfield.py
@@ -11,7 +11,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeTextFieldAdmin(parent_class):
-    fieldsets=((_('AttributeTextField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributeTextField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
     prepopulated_fields = {'svalue': ('value', )}
diff --git a/gstudio/admin/attribute_timefield.py b/gstudio/admin/attribute_timefield.py
index 0c1c5a03..dac2c41e 100644
--- a/gstudio/admin/attribute_timefield.py
+++ b/gstudio/admin/attribute_timefield.py
@@ -11,7 +11,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeTimeFieldAdmin(parent_class):
-    fieldsets=((_('AttributeTimeField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributeTimeField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
     prepopulated_fields = {'svalue': ('value', )}
diff --git a/gstudio/admin/attribute_urlfield.py b/gstudio/admin/attribute_urlfield.py
index 6f773819..b65a27d4 100644
--- a/gstudio/admin/attribute_urlfield.py
+++ b/gstudio/admin/attribute_urlfield.py
@@ -11,7 +11,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeURLFieldAdmin(parent_class):
-    fieldsets=((_('AttributeURLField'),{'fields': ('attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
+    fieldsets=((_('AttributeURLField'),{'fields': ('metatypes','attributetype','attributetype_scope','subject','subject_scope','svalue','value_scope','value')}),
 
 )
     prepopulated_fields = {'svalue': ('value', )}
diff --git a/gstudio/admin/attributespecification.py b/gstudio/admin/attributespecification.py
index 781343b4..8e9bc5fd 100644
--- a/gstudio/admin/attributespecification.py
+++ b/gstudio/admin/attributespecification.py
@@ -2,6 +2,7 @@
 from django.contrib import admin
 from django.core.urlresolvers import NoReverseMatch
 from django.utils.translation import ugettext_lazy as _ 
+from django.template.defaultfilters import slugify
 
 from gstudio.admin.forms import AttributeSpecificationAdminForm
 from gstudio.settings import GSTUDIO_VERSIONING
@@ -12,4 +13,12 @@ else:
     parent_class = admin.ModelAdmin 
 
 class AttributeSpecificationAdmin(parent_class):
-    pass
+    fieldsets=((_('AttributeSpecification'),{'fields': ('metatypes','title','attributetype','subjects','slug')}),
+
+)
+    prepopulated_fields = {'slug': ('title', )}
+    def save_model(self, request, attributespecification, form, change):
+        #attributespecification.title = attributespecification.composed_subject
+        attributespecification.slug =   slugify(attributespecification.title)
+        attributespecification.save()
+    
diff --git a/gstudio/admin/complement.py b/gstudio/admin/complement.py
index 305bb46e..6cff0887 100644
--- a/gstudio/admin/complement.py
+++ b/gstudio/admin/complement.py
@@ -2,6 +2,7 @@ from django.contrib import admin
 from django.core.urlresolvers import NoReverseMatch
 from django.utils.translation import ugettext_lazy as _
 
+from django.template.defaultfilters import slugify
 from gstudio.admin.forms import ComplementAdminForm
 import reversion
 from gstudio.settings import GSTUDIO_VERSIONING
@@ -11,4 +12,9 @@ else:
     parent_class = admin.ModelAdmin 
 
 class ComplementAdmin(parent_class):
-    pass
+    fieldsets=((_('Complement'),{'fields':('title','nodetypes','metatypes','slug')}),)
+    
+    def save_model(self, request, complement, form, change):
+        #complement.title=self.composed_subject
+        complement.slug=slugify(complement.title)
+        complement.save()
diff --git a/gstudio/admin/expression.py b/gstudio/admin/expression.py
index cebd6969..49a6f2d0 100644
--- a/gstudio/admin/expression.py
+++ b/gstudio/admin/expression.py
@@ -2,6 +2,7 @@
 from django.contrib import admin
 from django.core.urlresolvers import NoReverseMatch
 from django.utils.translation import ugettext_lazy as _
+from django.template.defaultfilters import slugify
 
 from gstudio.admin.forms import ExpressionAdminForm
 import reversion
@@ -12,7 +13,11 @@ else:
     parent_class = admin.ModelAdmin 
 
 class ExpressionAdmin(parent_class):
-    def save_model(self, request, expression, form, change):
+    fieldsets=((_('Expression'),{'fields': ('metatypes','title','left_term','relationtype','right_term','slug')}),
+               )
+    prepopulated_fields = {'slug': ('title', )}
+    def save_model(self, request,expression, form, change):
         expression.title = expression.composed_sentence
+        expression.slug =   slugify(expression.title)
         expression.save()
 
diff --git a/gstudio/admin/intersection.py b/gstudio/admin/intersection.py
index 49f2c5d0..8658f504 100644
--- a/gstudio/admin/intersection.py
+++ b/gstudio/admin/intersection.py
@@ -11,4 +11,11 @@ else:
     parent_class = admin.ModelAdmin 
 
 class IntersectionAdmin(parent_class):
-    pass
+    fieldsets=((_('Intersection'),{'fields': ('metatypes','title','nodetypes','slug')}),
+               )
+    prepopulated_fields = {'slug': ('title', )}
+    def save_model(self, request,intersection, form, change):
+        #intersection.title = intersection.composed_subject
+        intersection.slug =   slugify(intersection.title)
+        intersection.save()
+
diff --git a/gstudio/admin/nodespecification.py b/gstudio/admin/nodespecification.py
index f55bd05b..0be88786 100644
--- a/gstudio/admin/nodespecification.py
+++ b/gstudio/admin/nodespecification.py
@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django.core.urlresolvers import NoReverseMatch
 from django.utils.translation import ugettext_lazy as _
+from django.template.defaultfilters import slugify
 
 from gstudio.admin.forms import NodeSpecificationAdminForm
 import reversion
@@ -11,4 +12,11 @@ else:
     parent_class = admin.ModelAdmin 
 
 class NodeSpecificationAdmin(parent_class):
-    pass
+    fieldsets=((_('NodeSpecification'),{'fields': ('metatypes','title','relations','attributes','subject','slug')}),
+               )
+    prepopulated_fields = {'slug': ('title', )}
+    def save_model(self, request,nodespecification, form, change):
+        #nodespecification.title = nodespecification.composed_subject                                                                                
+        nodespecification.slug =   slugify(nodespecification.title)
+        nodespecification.save()
+    
diff --git a/gstudio/admin/relation.py b/gstudio/admin/relation.py
index 264a21bc..fe7b0834 100644
--- a/gstudio/admin/relation.py
+++ b/gstudio/admin/relation.py
@@ -15,7 +15,7 @@ else:
     parent_class = admin.ModelAdmin 
 
 class RelationAdmin(parent_class):
-    fieldsets=((_('Relation'),{'fields': ('relationtype','relationtype_scope','left_subject' ,'left_subject_scope','right_subject','right_subject_scope')}),
+    fieldsets=((_('Relation'),{'fields': ('relationtype','relationtype_scope','left_subject' ,'left_subject_scope','right_subject','right_subject_scope','metatypes')}),
 
 )
     
diff --git a/gstudio/admin/relationspecification.py b/gstudio/admin/relationspecification.py
index 6018236d..8f57dc1c 100644
--- a/gstudio/admin/relationspecification.py
+++ b/gstudio/admin/relationspecification.py
@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django.core.urlresolvers import NoReverseMatch
 from django.utils.translation import ugettext_lazy as _
+from django.template.defaultfilters import slugify
 
 from gstudio.admin.forms import RelationSpecificationAdminForm
 import reversion
@@ -12,4 +13,12 @@ else:
     parent_class = admin.ModelAdmin 
 
 class RelationSpecificationAdmin(parent_class):
-    pass
+    fieldsets=((_('RelationSpecification'),{'fields': ('metatypes','title','relationtype','subjects','slug')}),
+               )
+    prepopulated_fields = {'slug': ('title', )}
+    def save_model(self, request,relationspecification, form, change):
+        #relationspecification.title = relationspecification.composed_subject                                                                              
+        relationspecification.slug =   slugify(relationspecification.title)
+        relationspecification.save()
+
+
diff --git a/gstudio/admin/union.py b/gstudio/admin/union.py
index d9bc092c..5875c6aa 100644
--- a/gstudio/admin/union.py
+++ b/gstudio/admin/union.py
@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django.core.urlresolvers import NoReverseMatch
 from django.utils.translation import ugettext_lazy as _
+from django.template.defaultfilters import slugify
 
 from gstudio.admin.forms import UnionAdminForm
 from gstudio.settings import GSTUDIO_VERSIONING
@@ -12,4 +13,10 @@ else:
     parent_class = admin.ModelAdmin 
 
 class UnionAdmin(parent_class):
-    pass
+    fieldsets=((_('Union'),{'fields': ('metatypes','title','nodetypes','slug')}),
+               )
+    prepopulated_fields = {'slug': ('title', )}
+    def save_model(self, request,union, form, change):
+        #union.title = union.composed_sentence
+        union.slug =   slugify(union.title)
+        union.save()