This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

remove option for importing FruitShow posts - it probably wasn't used…

… by anyone
  • Loading branch information...
kjk committed Nov 29, 2010
1 parent a398393 commit f4ef62afd41bda16780c47b2071e767aa72a039d
Showing with 5 additions and 15 deletions.
  1. +4 −9 main.py
  2. +0 −6 manage_forums.html
  3. +1 −0 todo.txt
View
13 main.py
@@ -88,8 +88,7 @@ class Forum(db.Model):
skin = db.StringProperty()
# Google analytics code
analytics_code = db.StringProperty()
- # secret value that needs to be passed in form data
- # as 'secret' field to /import
+ # Note: import_secret is obsolete
import_secret = db.StringProperty()
# A forum is collection of topics
@@ -332,8 +331,8 @@ def post(self):
# invalid key - should not happen so go to top-level
return self.redirect("/")
- vals = ['url','title', 'tagline', 'sidebar', 'disable', 'enable', 'importsecret', 'analyticscode']
- (url, title, tagline, sidebar, disable, enable, import_secret, analytics_code) = req_get_vals(self.request, vals)
+ vals = ['url','title', 'tagline', 'sidebar', 'disable', 'enable', 'analyticscode']
+ (url, title, tagline, sidebar, disable, enable, analytics_code) = req_get_vals(self.request, vals)
errmsg = None
if not valid_forum_url(url):
@@ -351,7 +350,6 @@ def post(self):
'prevtitle' : title,
'prevtagline' : tagline,
'prevsidebar' : sidebar,
- 'previmportsecret' : import_secret,
'prevanalyticscode' : analytics_code,
'forum_key' : forum_key,
'errmsg' : errmsg
@@ -365,13 +363,12 @@ def post(self):
forum.title = title
forum.tagline = tagline
forum.sidebar = sidebar
- forum.import_secret = import_secret
forum.analytics_code = analytics_code
forum.put()
msg = "Forum '%s' has been updated." % title_or_url
else:
# create a new forum
- forum = Forum(url=url, title=title, tagline=tagline, sidebar=sidebar, import_secret = import_secret, analytics_code = analytics_code)
+ forum = Forum(url=url, title=title, tagline=tagline, sidebar=sidebar, analytics_code = analytics_code)
forum.put()
msg = "Forum '%s' has been created." % title_or_url
url = "/manageforums?msg=%s" % urllib.quote(to_utf8(msg))
@@ -432,7 +429,6 @@ def render_rest(self, tvals, forum=None):
tvals['prevtitle'] = f.title
tvals['prevtagline'] = f.tagline
tvals['prevsidebar'] = f.sidebar
- tvals['previmportsecret'] = f.import_secret
tvals['prevanalyticscode'] = f.analytics_code
tvals['forum_key'] = str(f.key())
forums.append(f)
@@ -923,7 +919,6 @@ def main():
('/[^/]+/email', EmailForm),
('/[^/]+/rss', RssFeed),
('/[^/]+/rssall', RssAllFeed),
- #('/[^/]+/importfruitshow', ImportFruitshow),
('/[^/]+/?', TopicList)],
debug=True)
wsgiref.handlers.CGIHandler().run(application)
View
6 manage_forums.html 100644 → 100755
@@ -84,10 +84,6 @@ <h1><a href="" class="green" id="titleId">{{ forum.title_non_empty }}</a></h1>
<td valign="top">Analytics code</td>
<td><input type="edit" size="60" maxlength="256" name="analyticscode" value="{{ prevanalyticscode|escape }}"></input></td>
</tr>
- <tr>
- <td valign="top">Import secret</td>
- <td><input type="edit" size="60" maxlength="256" name="importsecret" value="{{ previmportsecret|escape }}"></input></td>
- </tr>
<tr>
<td valign="top">Sidebar</td>
<td><textarea name="sidebar" rows="6" cols="45" id="sidebarFieldId" onchange="return onSidebarFieldChange();" onkeyup="return onSidebarFieldChange();">{{ prevsidebar|escape }}</textarea></td>
@@ -108,8 +104,6 @@ <h1><a href="" class="green" id="titleId">{{ forum.title_non_empty }}</a></h1>
<p><b>Tagline</b> is shown in smaller font, under title. HTML allowed (e.g. for links).</p>
<p><b>Analytics code</b> is Googl Analytics code. If given, key pages will include Google Analytics
JavaScript with this code</p>
- <p><b>Import secret</b> protects bulk topic import interface.
- See <a href="http://blog.kowalczyk.info/software/fofou">docs</a> for more information</p>
<p><b>Sidebar</b> is displayed in the left column. HTML allowed.</p>
<p>Don't stress about choosing the right values - you can change them later.</p>
</td>
View
@@ -8,6 +8,7 @@ sure you'll have no trouble coming up with your own list of possible
improvements.
TODO nice to have:
+ - unchecking 'remember me' on post doesn't seem to make us forget
- comment count should only count non-deleted posts
- mass delete of posts from a given ip address and/or user account
- use ajax google search ui

0 comments on commit f4ef62a

Please sign in to comment.