blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

new option: VFEED_GROUP_BY_FEED (bump schema version)

Browse source
This commit is contained in:
Andrew Dolgov 2008-05-17 05:50:58 +01:00
parent 081e527d3a
commit d00f22ac59
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
functions.php
View file

@ -3267,7 +3267,7 @@
$offset_query_part = "OFFSET $offset"; $offset_query_part = "OFFSET $offset";
} }
if ($vfeed_query_part && defined('_VFEED_GROUP_BY_FEED')) { if ($vfeed_query_part && get_pref($link, 'VFEED_GROUP_BY_FEED', $owner_uid)) {
if (!$override_order) { if (!$override_order) {
$order_by = "ttrss_feeds.title, $order_by"; $order_by = "ttrss_feeds.title, $order_by";
} }
@ -4928,7 +4928,7 @@
if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
if (defined('_VFEED_GROUP_BY_FEED')) { if (get_pref($link, 'VFEED_GROUP_BY_FEED')) {
if ($feed_id != $vgroup_last_feed) { if ($feed_id != $vgroup_last_feed) {
$cur_feed_title = $line["feed_title"]; $cur_feed_title = $line["feed_title"];
@ -4978,7 +4978,7 @@
# <a href=\"javascript:viewfeed($feed_id, '', false)\">". # <a href=\"javascript:viewfeed($feed_id, '', false)\">".
# $line["feed_title"]."</a> # $line["feed_title"]."</a>
if (!defined('_VFEED_GROUP_BY_FEED')) { if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
if ($line["feed_title"]) { if ($line["feed_title"]) {
print "<span class=\"hlFeed\"> print "<span class=\"hlFeed\">
(<a href=\"javascript:viewfeed($feed_id, '', false)\">". (<a href=\"javascript:viewfeed($feed_id, '', false)\">".
@ -5000,7 +5000,7 @@
} else { } else {
if (defined('_VFEED_GROUP_BY_FEED')) { if (get_pref($link, 'VFEED_GROUP_BY_FEED')) {
if ($feed_id != $vgroup_last_feed) { if ($feed_id != $vgroup_last_feed) {
$cur_feed_title = $line["feed_title"]; $cur_feed_title = $line["feed_title"];
@ -5051,7 +5051,7 @@
} }
if (!defined('_VFEED_GROUP_BY_FEED')) { if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
if ($line["feed_title"]) { if ($line["feed_title"]) {
print "&nbsp;(<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a>)"; print "&nbsp;(<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a>)";
} }

2
sanity_check.php
View file

@ -2,7 +2,7 @@
require_once "functions.php"; require_once "functions.php";
define('EXPECTED_CONFIG_VERSION', 15); define('EXPECTED_CONFIG_VERSION', 15);
define('SCHEMA_VERSION', 36); define('SCHEMA_VERSION', 37);
if (!file_exists("config.php")) { if (!file_exists("config.php")) {
print __("<b>Fatal Error</b>: You forgot to copy print __("<b>Fatal Error</b>: You forgot to copy

5
schema/ttrss_schema_mysql.sql
View file

@ -209,7 +209,7 @@ create table ttrss_tags (id integer primary key auto_increment,
create table ttrss_version (schema_version int not null) TYPE=InnoDB; create table ttrss_version (schema_version int not null) TYPE=InnoDB;
insert into ttrss_version values (36); insert into ttrss_version values (37);
create table ttrss_enclosures (id serial not null primary key, create table ttrss_enclosures (id serial not null primary key,
content_url text not null, content_url text not null,
@ -329,6 +329,9 @@ 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('HIDE_FEEDLIST', 1, 'false', 'Hide feedlist',2, 'This option hides feedlist and allows it to be toggled on the fly, useful for small screens.'); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('HIDE_FEEDLIST', 1, 'false', 'Hide feedlist',2, 'This option hides feedlist and allows it to be toggled on the fly, useful for small screens.');
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('VFEED_GROUP_BY_FEED', 1, 'false', 'Group headlines in virtual feeds',2,
'When this option is enabled, headlines in Special feeds and Labels are grouped by feeds');
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),

5
schema/ttrss_schema_pgsql.sql
View file

@ -189,7 +189,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid);
create table ttrss_version (schema_version int not null); create table ttrss_version (schema_version int not null);
insert into ttrss_version values (36); insert into ttrss_version values (37);
create table ttrss_enclosures (id serial not null primary key, create table ttrss_enclosures (id serial not null primary key,
content_url text not null, content_url text not null,
@ -303,6 +303,9 @@ 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('HIDE_FEEDLIST', 1, 'false', 'Hide feedlist',2, 'This option hides feedlist and allows it to be toggled on the fly, useful for small screens.'); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('HIDE_FEEDLIST', 1, 'false', 'Hide feedlist',2, 'This option hides feedlist and allows it to be toggled on the fly, useful for small screens.');
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('VFEED_GROUP_BY_FEED', 1, 'false', 'Group headlines in virtual feeds',2,
'When this option is enabled, headlines in Special feeds and Labels are grouped by feeds');
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,