Author: duncan
Date: Mon Dec 24 08:00:28 2007
New Revision: 10237
Log:
[ 1857394 ] Fixed favorites display for No Dupes and New Episodes
Patch by James Trietsch applied
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/src/www/htdocs/edit_favorite.rpy
branches/rel-1-7/freevo/src/www/htdocs/favorites.rpy
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/www/htdocs/edit_favorite.rpy
branches/rel-1/freevo/src/www/htdocs/favorites.rpy
Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog (original)
+++ branches/rel-1-7/freevo/ChangeLog Mon Dec 24 08:00:28 2007
@@ -16,7 +16,8 @@
== Release 1.7.6 (2008-??-??) ==
--------------------------------
- * Fixed onclick weather plug-in to allow non-ascii location names (B#1856597)
+ * Fixed oneclick weather plug-in to allow non-ascii location names (B#1856597)
+ * Fixed web server favorites and edit_favorite to use name and duplicate
detection (B#1857394)
== Release 1.7.5 (2007-12-22) ==
--------------------------------
Modified: branches/rel-1-7/freevo/src/www/htdocs/edit_favorite.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/edit_favorite.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/edit_favorite.rpy Mon Dec 24
08:00:28 2007
@@ -286,6 +286,17 @@
mod_index = int(fav.mod)/30 + 1
fv.res += 'document.editfavorite.mod.options[%s].selected=true\n'
% mod_index
+
+ if config.TV_RECORD_DUPLICATE_DETECTION:
+ (tempStatus, tempFav) = ri.getFavorite(fav.name)
+ if hasattr(tempFav, 'allowDuplicates'):
+ fv.res +=
'document.editfavorite.allowDuplicates.options[%s].selected=true\n' %
abs(int(tempFav.allowDuplicates)-1)
+
+ if config.TV_RECORD_ONLY_NEW_DETECTION:
+ (tempStatus, tempFav) = ri.getFavorite(fav.name)
+ if hasattr(tempFav, 'onlyNew'):
+ fv.res +=
'document.editfavorite.onlyNew.options[%s].selected=true\n' %
int(tempFav.onlyNew)
+
fv.res += '</script>'
fv.printSearchForm()
Modified: branches/rel-1-7/freevo/src/www/htdocs/favorites.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/favorites.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/favorites.rpy Mon Dec 24
08:00:28 2007
@@ -149,7 +149,7 @@
fv.tableCell(cell, 'class="'+status+'" colspan="1"')
if config.TV_RECORD_DUPLICATE_DETECTION:
- (tempStatus, tempFav) = ri.getFavorite(fav.title)
+ (tempStatus, tempFav) = ri.getFavorite(fav.name)
if hasattr(tempFav,'allowDuplicates') and
int(tempFav.allowDuplicates) == 1:
cell = 'ALLOW'
elif hasattr(tempFav,'allowDuplicates') and
int(tempFav.allowDuplicates) == 0:
@@ -159,7 +159,7 @@
fv.tableCell(cell, 'class="'+status+'" colspan="1"')
if config.TV_RECORD_ONLY_NEW_DETECTION:
- (tempStatus, tempFav) = ri.getFavorite(fav.title)
+ (tempStatus, tempFav) = ri.getFavorite(fav.name)
if hasattr(tempFav,'onlyNew') and int(tempFav.onlyNew) == 1:
cell = 'ONLY NEW'
elif hasattr(tempFav,'onlyNew') and int(tempFav.onlyNew) == 0:
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Mon Dec 24 08:00:28 2007
@@ -19,7 +19,8 @@
== Release 1.7.6 (2008-??-??) ==
--------------------------------
- * Fixed onclick weather plug-in to allow non-ascii location names (B#1856597)
+ * Fixed oneclick weather plug-in to allow non-ascii location names (B#1856597)
+ * Fixed web server favorites and edit_favorite to use name and duplicate
detection (B#1857394)
== Release 1.8.0rc1 (2007-12-22) ==
--------------------------------
Modified: branches/rel-1/freevo/src/www/htdocs/edit_favorite.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/edit_favorite.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/edit_favorite.rpy Mon Dec 24
08:00:28 2007
@@ -286,6 +286,17 @@
mod_index = int(fav.mod)/30 + 1
fv.res += 'document.editfavorite.mod.options[%s].selected=true\n'
% mod_index
+
+ if config.TV_RECORD_DUPLICATE_DETECTION:
+ (tempStatus, tempFav) = ri.getFavorite(fav.name)
+ if hasattr(tempFav, 'allowDuplicates'):
+ fv.res +=
'document.editfavorite.allowDuplicates.options[%s].selected=true\n' %
abs(int(tempFav.allowDuplicates)-1)
+
+ if config.TV_RECORD_ONLY_NEW_DETECTION:
+ (tempStatus, tempFav) = ri.getFavorite(fav.name)
+ if hasattr(tempFav, 'onlyNew'):
+ fv.res +=
'document.editfavorite.onlyNew.options[%s].selected=true\n' %
int(tempFav.onlyNew)
+
fv.res += '</script>'
fv.printSearchForm()
Modified: branches/rel-1/freevo/src/www/htdocs/favorites.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/favorites.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/favorites.rpy Mon Dec 24 08:00:28 2007
@@ -149,7 +149,7 @@
fv.tableCell(cell, 'class="'+status+'" colspan="1"')
if config.TV_RECORD_DUPLICATE_DETECTION:
- (tempStatus, tempFav) = ri.getFavorite(fav.title)
+ (tempStatus, tempFav) = ri.getFavorite(fav.name)
if hasattr(tempFav,'allowDuplicates') and
int(tempFav.allowDuplicates) == 1:
cell = 'ALLOW'
elif hasattr(tempFav,'allowDuplicates') and
int(tempFav.allowDuplicates) == 0:
@@ -159,7 +159,7 @@
fv.tableCell(cell, 'class="'+status+'" colspan="1"')
if config.TV_RECORD_ONLY_NEW_DETECTION:
- (tempStatus, tempFav) = ri.getFavorite(fav.title)
+ (tempStatus, tempFav) = ri.getFavorite(fav.name)
if hasattr(tempFav,'onlyNew') and int(tempFav.onlyNew) == 1:
cell = 'ONLY NEW'
elif hasattr(tempFav,'onlyNew') and int(tempFav.onlyNew) == 0:
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
