|
Check-in Number:
|
420 | |
| Date: |
2009-Sep-22 16:15:23 (local)
2009-Sep-22 23:15:23 (UTC) |
| User: | majid |
| Branch: | |
| Comment: |
added option to edit feed HTML link, not just the RSS/Atom link |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
temboz/pages/feed_info.tmpl 1.21 -> 1.22
--- /tmp/T0DSaiV0 Mon Sep 6 18:06:23 2010
+++ /tmp/T1ESaiV0 Mon Sep 6 18:06:23 2010
@@ -100,7 +100,7 @@
########################################################################
##
-## Change feed title/desc/filter if requested
+## Change feed title/html/desc/filter if requested
##
########################################################################
#if $getVar('feed_title', None) and $getVar('feed_title', None) != feed_title
@@ -108,6 +108,11 @@
<p>Feed title updated successfully.</p>
#set feed_title = $getVar('feed_title', feed_title)
#end if
+#if $getVar('feed_html', None) and $getVar('feed_html', None) != feed_html
+#silent update.update_feed_html($feed_uid, $getVar('feed_html'))
+<p>Feed HTML link updated successfully.</p>
+#set feed_html = $getVar('feed_html', feed_html)
+#end if
#if $getVar('feed_desc', None) and $getVar('feed_desc', None) != feed_desc
#silent update.update_feed_desc($feed_uid, $getVar('feed_desc'))
<p>Feed description updated successfully.</p>
@@ -159,17 +164,20 @@
########################################################################
<form method="POST" name="feed_xml">
<table>
-<tr><td>Title:</td><td><input name="feed_title" size="80"
+<tr><td>Title</td><td><input name="feed_title" size="80"
value="<%=feed_title%>"></td></tr>
-<tr><td><a href="<%=feed_xml%>">Feed</a>:</td>
+<tr><td><a href="<%=feed_html%>">Site</a></td>
+<td><input name="feed_html" size="80" value="<%=feed_html%>"></td></tr>
+</tr>
+<tr><td><a href="<%=feed_xml%>">Feed</a></td>
<td>
#echo self.regurgitate_except()
<input name="feed_xml" size="80" value="<%=feed_xml%>"></td></tr>
#set lines = max(4, len(feed_desc) // 80 + 1)
-<tr><td>Desc:</td><td><textarea cols="80" rows="$lines"
+<tr><td>Desc</td><td><textarea cols="80" rows="$lines"
name="feed_desc"><%=feed_desc%></textarea></td></tr>
#set lines = max(4, filters.rule_lines(feed_filter))
-<tr><td>Filter:</td><td><textarea cols="80" rows="$lines"
+<tr><td>Filter</td><td><textarea cols="80" rows="$lines"
name="feed_filter"><%=feed_filter%></textarea></td></tr>
<tr><td colspan="2" align="center"><input type="button" value="Clear"
onclick="document.forms.feed_xml.feed_xml.value='';document.forms.feed_xml.feed_title.value='';document.forms.feed_xml.feed_desc.value='';document.forms.feed_xml.feed_xml.focus();">
temboz/update.py 1.67 -> 1.68
--- /tmp/T07SaWV0 Mon Sep 6 18:06:23 2010
+++ /tmp/T18SaWV0 Mon Sep 6 18:06:23 2010
@@ -158,6 +158,19 @@
finally:
c.close()
+def update_feed_html(feed_uid, feed_html):
+ """Update a feed HTML link"""
+ feed_uid = int(feed_uid)
+
+ from singleton import db
+ c = db.cursor()
+ try:
+ c.execute("update fm_feeds set feed_html=? where feed_uid=?",
+ [feed_html, feed_uid])
+ db.commit()
+ finally:
+ c.close()
+
def update_feed_desc(feed_uid, feed_desc):
"""Update a feed desc"""
feed_uid = int(feed_uid)