Changeset 1839

Timestamp:

11/03/08 17:48:10 (2 months ago)

Author:

rmarianski

Message:

check in additional attempt at using a property for the story type. The type does not yet stay match the actual story type across all add/edit workflows

Location:

siteapp/branches/story-type-as-attribute/opengeo/almanac

Files:

• content.py (modified) (2 diffs)
• rest.txt (modified) (2 diffs)
• security.txt (modified) (1 diff)
• smoketest.txt (modified) (1 diff)

siteapp/branches/story-type-as-attribute/opengeo/almanac/content.py

@@ -271 +271 @@
     grok.implements(IStory)
 
+    def _get_type(self):
+        from utils import _media_type_scheme
+        for scheme, type, label in self.categories:
+            if scheme == _media_type_scheme:
+                if label == 'words':
+                    return 'text'
+                return label
+        return 'text'
+        raise ValueError('Could not find media type from categories: %s' %
+                         self.categories)
+
+    def _set_type(self, value):
+        assert value in ('text', 'image', 'video'), "Invalid story media type: '%s'" % value
+        from utils import _media_type_scheme
+        cats = []
+        media_type_added = False
+        for scheme, type, label in self.categories:
+            if scheme == _media_type_scheme:
+                cats.append((scheme, type, value))
+                media_type_added = True
+            else:
+                cats.append((scheme, type, label))
+        if not media_type_added:
+            cats.append((_media_type_scheme, 'Story', value))
+        self.categories = tuple(cats)
+
+    type = property(_get_type, _set_type)
 
 class Comment(BaseModel):
@@ -382 +409 @@
     @grok.action("Update")
     def update_obj(self, **data):
+        # XXX we lose the correct type for whatever reason
+        type = self.context.type
         self.applyData(self.context, **data)
+        self.context.type = type
         self.flash(u'Almanac updated')
         self.redirect(self.url(self.context))

siteapp/branches/story-type-as-attribute/opengeo/almanac/rest.txt

@@ -30 +30 @@
     >>> request = testing.new_interaction('bob')
     >>> alm1, s1 = content_setup(app, request, data1, data2)
-    >>> s1.type = 'image'
-    >>> s1.photoid = '1234'
     >>> endInteraction()
 
@@ -206 +204 @@
      ('http://xmlns.opengeo.org/almanac/atom#contenttype', 'Story', 'Story'))
 
-    >>> story.type = 'text'
-
 
 Security

siteapp/branches/story-type-as-attribute/opengeo/almanac/security.txt

@@ -232 +232 @@
 and should be able to delete the story of another::
 
-    >>> app['a1']['third-awesome-story.1'].type = 'text'
     >>> url = "http://localhost/++rest++app/our-app/a1/third-awesome-story.1"
     >>> response = http_call('DELETE', url, data=testing.entry1, handle_errors=True, **make_header('dude'))

siteapp/branches/story-type-as-attribute/opengeo/almanac/smoketest.txt

@@ -20 +20 @@
 
     >>> a1, s1 = testing.setup_basic_content_fixture(app, request, data1, data2)
-    >>> s1.type = 'text'
     >>> endInteraction()
     >>> alm1 = a1