コミット: e1c74dfb8a9a750a752ddf4796eb2dadbbc71848 - allura (git)

allura

コミットメタ情報

• リビジョン: e1c74dfb8a9a750a752ddf4796eb2dadbbc71848 (tree)
• 日時: 2012-05-17 07:18:18
• 作者: bolkimen <bolkimen@yaho...>
• コミッター: Cory Johns

ログメッセージ

ticket:48 finish site path for feed list edit

変更サマリ

• modified: ForgeBlog/forgeblog/main.py
• modified: ForgeBlog/forgeblog/model/__init__.py
• modified: ForgeBlog/forgeblog/model/blog.py
• add: ForgeBlog/forgeblog/templates/blog/admin_exfeed.html

差分

--- a/ForgeBlog/forgeblog/main.py
+++ b/ForgeBlog/forgeblog/main.py
@@ -12,12 +12,14 @@ from pylons import g, c, request, response
 from formencode import validators
 from webob import exc
 
+from ming.orm import session
+
 # Pyforge-specific imports
 from allura.app import Application, ConfigOption, SitemapEntry
 from allura.app import DefaultAdminController
 from allura.lib import helpers as h
 from allura.lib.search import search
-from allura.lib.decorators import require_post
+from allura.lib.decorators import require_post, Property
 from allura.lib.security import has_access, require_access
 from allura.lib import widgets as w
 from allura.lib.widgets.subscriptions import SubscribeForm
@@ -56,6 +58,7 @@ class ForgeBlogApp(Application):
     ordinal=14
     installable=True
     config_options = Application.config_options
+    default_external_feeds = []
     icons={
         24:'images/blog_24.png',
         32:'images/blog_32.png',
@@ -67,6 +70,24 @@ class ForgeBlogApp(Application):
         self.root = RootController()
         self.admin = BlogAdminController(self)
 
+    @Property
+    def external_feeds_list():
+        def fget(self):
+            globals = BM.Globals.query.get(app_config_id=self.config._id)
+            if globals is not None:
+                external_feeds = globals.external_feeds
+            else:
+                external_feeds = self.default_external_feeds
+            return external_feeds
+        def fset(self, new_external_feeds):
+            globals = BM.Globals.query.get(app_config_id=self.config._id)
+            if globals is not None:
+                globals.external_feeds = new_external_feeds
+            elif len(new_external_feeds) > 0:
+                globals = BM.Globals(app_config_id=self.config._id, root=new_external_feeds)
+            if globals is not None:
+                session(globals).flush()
+
     @property
     @h.exceptionless([], log)
     def sitemap(self):
@@ -94,7 +115,11 @@ class ForgeBlogApp(Application):
         return links
 
     def admin_menu(self):
-        return super(ForgeBlogApp, self).admin_menu(force_options=True)
+        admin_url = c.project.url() + 'admin/' + self.config.options.mount_point + '/'
+        links = [SitemapEntry('External feeds', admin_url + 'exfeed', className='admin_modal')]
+        links += super(ForgeBlogApp, self).admin_menu(force_options=True)
+        return links
+        #return super(ForgeBlogApp, self).admin_menu(force_options=True)
 
     def install(self, project):
         'Set up any default permissions and roles here'
@@ -359,3 +384,34 @@ class BlogAdminController(DefaultAdminController):
         self.app.config.options['show_discussion'] = show_discussion and True or False
         flash('Blog options updated')
         redirect(h.really_unicode(c.project.url()+'admin/tools').encode('utf-8'))
+
+    @without_trailing_slash
+    @expose('jinja:forgeblog:templates/blog/admin_exfeed.html')
+    def exfeed(self):
+        #self.app.external_feeds_list = ['feed1', 'feed2']
+        #log.info("EXFEED: %s" % self.app.external_feeds_list)
+        feeds_list = []
+        for feed in self.app.external_feeds_list:
+            feeds_list.append(feed)
+        return dict(app=self.app,
+                    feeds_list=feeds_list,
+                    allow_config=has_access(self.app, 'configure')())
+
+    @without_trailing_slash
+    @expose()
+    @require_post()
+    def set_exfeed(self, **kw):
+        new_exfeed = kw.get('new_exfeed', None)
+        exfeed_val = kw.get('exfeed', [])
+        if type(exfeed_val) == unicode:
+            exfeed_list = []
+            exfeed_list.append(exfeed_val)
+        else:
+            exfeed_list = exfeed_val
+
+        if new_exfeed is not None and new_exfeed != '':
+            exfeed_list.append(new_exfeed)
+
+        self.app.external_feeds_list = exfeed_list
+        flash('External feeds updated')
+        redirect(c.project.url()+'admin/tools')

--- a/ForgeBlog/forgeblog/model/__init__.py
+++ b/ForgeBlog/forgeblog/model/__init__.py
@@ -1 +1 @@
-from blog import BlogPost, Attachment, BlogPostSnapshot
+from blog import Globals, BlogPost, Attachment, BlogPostSnapshot

--- a/ForgeBlog/forgeblog/model/blog.py
+++ b/ForgeBlog/forgeblog/model/blog.py
@@ -9,6 +9,8 @@ from pymongo.errors import DuplicateKeyError
 
 from ming import schema
 from ming.orm import FieldProperty, ForeignIdProperty, Mapper, session, state
+from ming.orm.declarative import MappedClass
+
 from allura import model as M
 from allura.lib import helpers as h
 from allura.lib import utils, patience
@@ -16,6 +18,19 @@ from allura.lib import utils, patience
 config = utils.ConfigProxy(
     common_suffix='forgemail.domain')
 
+class Globals(MappedClass):
+
+    class __mongometa__:
+        name = 'blog-globals'
+        session = M.project_orm_session
+        indexes = [ 'app_config_id' ]
+
+    type_s = 'BlogGlobals'
+    _id = FieldProperty(schema.ObjectId)
+    app_config_id = ForeignIdProperty('AppConfig', if_missing=lambda:context.app.config._id)
+    external_feeds=FieldProperty([str])
+
+
 class BlogPostSnapshot(M.Snapshot):
     class __mongometa__:
         name='blog_post_snapshot'

--- /dev/null
+++ b/ForgeBlog/forgeblog/templates/blog/admin_exfeed.html
@@ -0,0 +1,27 @@
+<form method="POST" action="{{c.project.url()}}admin/{{app.config.options.mount_point}}/set_exfeed">
+  <label class="grid-13">Existing external feeds:</label>
+  <div class="grid-13">
+    <ul>
+    {% if allow_config %}
+     {% for feed in feeds_list %}
+     <li><input type="checkbox" name="exfeed" value="{{ feed }}" checked="checked"><span>{{ feed }}</span></li>
+     {% endfor %} 
+    {% else %}
+     {% for feed in feeds_list %}
+     <li><span>{{ feed.value }}</span></li>
+     {% endfor %} 
+    {% endif %}
+  </div>
+  {% if allow_config %}
+    <div class="grid-13">&nbsp;</div>
+    <div class="grid-13">
+       <input type="text" name="new_exfeed" id="new_exfeed" value=""/>
+    </div>
+    <div class="grid-13">&nbsp;</div>
+    <hr>
+    <div class="grid-13">&nbsp;</div>
+    <div class="grid-13">
+      <input type="submit" value="Save"/>
+    </div>
+  {% endif %}
+</form>