Revision 34d3883a snf-astakos-app/astakos/im/models.py

b/snf-astakos-app/astakos/im/models.py
142 142
            self.resource_set.create(**s)
143 143

  
144 144

  
145
class ResourceMetadata(models.Model):
146
    key = models.CharField(_('Name'), max_length=255, unique=True, db_index=True)
147
    value = models.CharField(_('Value'), max_length=255)
148

  
149 145
_presentation_data = {}
150 146
def get_presentation(resource):
151 147
    global _presentation_data
......
157 153
    return presentation
158 154

  
159 155
class Resource(models.Model):
160
    name = models.CharField(_('Name'), max_length=255)
161
    meta = models.ManyToManyField(ResourceMetadata)
156
    name = models.CharField(_('Name'), max_length=255, unique=True)
162 157
    service = models.ForeignKey(Service)
163 158
    desc = models.TextField(_('Description'), null=True)
164 159
    unit = models.CharField(_('Name'), null=True, max_length=255)
165 160
    group = models.CharField(_('Group'), null=True, max_length=255)
166 161
    uplimit = intDecimalField(default=0)
167 162

  
168
    class Meta:
169
        unique_together = ("service", "name")
170

  
171 163
    def __str__(self):
172
        return '%s%s%s' % (self.service, RESOURCE_SEPARATOR, self.name)
164
        return self.name
173 165

  
174 166
    def full_name(self):
175 167
        return str(self)

Also available in: Unified diff