valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new option: CONFIRM_FEED_CATCHUP (closes #106)

This commit is contained in:
Andrew Dolgov 2006-08-28 05:03:26 +01:00
parent 4065b60b41
commit f6d6e22ff4
6 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
functions.php
View File

@ -2084,6 +2084,9 @@
print "<param key=\"feeds_sort_by_unread\" value=\"" . print "<param key=\"feeds_sort_by_unread\" value=\"" .
sprintf("%d", get_pref($link, "FEEDS_SORT_BY_UNREAD")) . "\"/>"; sprintf("%d", get_pref($link, "FEEDS_SORT_BY_UNREAD")) . "\"/>";
print "<param key=\"confirm_feed_catchup\" value=\"" .
sprintf("%d", get_pref($link, "CONFIRM_FEED_CATCHUP")) . "\"/>";
print "</init-params>"; print "</init-params>";
} }

2
schema/ttrss_schema_mysql.sql
View File

@ -263,6 +263,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DIGEST_ENABLE', 1, 'false', 'Enable e-mail digest',1, insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DIGEST_ENABLE', 1, 'false', 'Enable e-mail digest',1,
'This option enables sending daily digest of new (and unread) headlines on your configured e-mail address'); 'This option enables sending daily digest of new (and unread) headlines on your configured e-mail address');
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',3);
create table ttrss_user_prefs ( create table ttrss_user_prefs (
owner_uid integer not null, owner_uid integer not null,
pref_name varchar(250), pref_name varchar(250),

2
schema/ttrss_schema_pgsql.sql
View File

@ -243,6 +243,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DIGEST_ENABLE', 1, 'false', 'Enable e-mail digest',1, insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DIGEST_ENABLE', 1, 'false', 'Enable e-mail digest',1,
'This option enables sending daily digest of new (and unread) headlines on your configured e-mail address'); 'This option enables sending daily digest of new (and unread) headlines on your configured e-mail address');
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',3);
create table ttrss_user_prefs ( create table ttrss_user_prefs (
owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE, owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE, pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE,

2
schema/upgrade-1.2.2-1.2.3-mysql.sql
View File

@ -6,5 +6,7 @@ update ttrss_feeds set include_in_digest = true;
alter table ttrss_feeds change include_in_digest include_in_digest bool not null; alter table ttrss_feeds change include_in_digest include_in_digest bool not null;
alter table ttrss_feeds alter column include_in_digest set default true; alter table ttrss_feeds alter column include_in_digest set default true;
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',3);
update ttrss_version set schema_version = 10; update ttrss_version set schema_version = 10;

2
schema/upgrade-1.2.2-1.2.3-pgsql.sql
View File

@ -6,5 +6,7 @@ update ttrss_feeds set include_in_digest = true;
alter table ttrss_feeds alter column include_in_digest set not null; alter table ttrss_feeds alter column include_in_digest set not null;
alter table ttrss_feeds alter column include_in_digest set default true; alter table ttrss_feeds alter column include_in_digest set default true;
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',3);
update ttrss_version set schema_version = 10; update ttrss_version set schema_version = 10;

2
tt-rss.js
View File

@ -571,7 +571,7 @@ function catchupCurrentFeed() {
str = "Mark all articles in this category as read?"; str = "Mark all articles in this category as read?";
} */ } */
if (confirm(str)) { if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
return viewCurrentFeed('MarkAllRead') return viewCurrentFeed('MarkAllRead')
} }
} }