diff options
Diffstat (limited to 'sugar_network/model')
-rw-r--r-- | sugar_network/model/__init__.py | 2 | ||||
-rw-r--r-- | sugar_network/model/release.py (renamed from sugar_network/model/implementation.py) | 2 | ||||
-rw-r--r-- | sugar_network/model/report.py | 10 | ||||
-rw-r--r-- | sugar_network/model/routes.py | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/sugar_network/model/__init__.py b/sugar_network/model/__init__.py index c846bc7..117649b 100644 --- a/sugar_network/model/__init__.py +++ b/sugar_network/model/__init__.py @@ -35,7 +35,7 @@ RESOURCES = ( 'sugar_network.model.artifact', 'sugar_network.model.comment', 'sugar_network.model.context', - 'sugar_network.model.implementation', + 'sugar_network.model.release', 'sugar_network.model.notification', 'sugar_network.model.feedback', 'sugar_network.model.report', diff --git a/sugar_network/model/implementation.py b/sugar_network/model/release.py index 53473e3..46eeaae 100644 --- a/sugar_network/model/implementation.py +++ b/sugar_network/model/release.py @@ -21,7 +21,7 @@ from sugar_network.toolkit.licenses import GOOD_LICENSES from sugar_network.toolkit.spec import parse_version -class Implementation(db.Resource): +class Release(db.Resource): @db.indexed_property(prefix='C', acl=ACL.CREATE | ACL.READ) diff --git a/sugar_network/model/report.py b/sugar_network/model/report.py index 8b2ca05..84db43a 100644 --- a/sugar_network/model/report.py +++ b/sugar_network/model/report.py @@ -24,13 +24,13 @@ class Report(db.Resource): return value @db.indexed_property(prefix='V', default='', acl=ACL.CREATE | ACL.READ) - def implementation(self, value): + def release(self, value): return value - @implementation.setter - def implementation(self, value): - if value and 'version' not in self.props and 'implementation' in value: - version = self.volume['implementation'].get(value) + @release.setter + def release(self, value): + if value and 'version' not in self.props and 'release' in value: + version = self.volume['release'].get(value) self['version'] = version['version'] return value diff --git a/sugar_network/model/routes.py b/sugar_network/model/routes.py index c5c4929..c8f8da6 100644 --- a/sugar_network/model/routes.py +++ b/sugar_network/model/routes.py @@ -31,10 +31,10 @@ class VolumeRoutes(db.Routes): mime_type='application/json') def feed(self, request, distro): context = self.volume['context'].get(request.guid) - implementations = self.volume['implementation'] + releases = self.volume['release'] versions = [] - impls, __ = implementations.find(context=context.guid, + impls, __ = releases.find(context=context.guid, not_layer='deleted', **request) for impl in impls: version = impl.properties([ @@ -51,7 +51,7 @@ class VolumeRoutes(db.Routes): del data[key] versions.append(version) - result = {'implementations': versions} + result = {'releases': versions} if distro: aliases = context['aliases'].get(distro) if aliases and 'binary' in aliases: |