new option: CONFIRM_FEED_CATCHUP (closes #106)
This commit is contained in:
parent
4065b60b41
commit
f6d6e22ff4
6 changed files with 12 additions and 1 deletions
|
@ -2084,6 +2084,9 @@
|
|||
print "<param key=\"feeds_sort_by_unread\" value=\"" .
|
||||
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>";
|
||||
}
|
||||
|
||||
|
|
|
@ -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,
|
||||
'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 (
|
||||
owner_uid integer not null,
|
||||
pref_name varchar(250),
|
||||
|
|
|
@ -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,
|
||||
'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 (
|
||||
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,
|
||||
|
|
|
@ -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 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;
|
||||
|
||||
|
|
|
@ -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 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;
|
||||
|
||||
|
|
|
@ -571,7 +571,7 @@ function catchupCurrentFeed() {
|
|||
str = "Mark all articles in this category as read?";
|
||||
} */
|
||||
|
||||
if (confirm(str)) {
|
||||
if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
|
||||
return viewCurrentFeed('MarkAllRead')
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue