Fossil SCM
Show technotes in /timeline.rss. Resolves problem reported in [forum:04614e8efa8e4af6 | forum post 04614e8efa8e4af6].
Commit
21344191a9c4450f4a90275502756c57de24a0a14d41c1d99acc62b25c3a5264
Parent
72070b304b8d269…
1 file changed
+4
-5
+4
-5
| --- src/rss.c | ||
| +++ src/rss.c | ||
| @@ -39,11 +39,10 @@ | ||
| 39 | 39 | ** |
| 40 | 40 | ** In addition, name=FILENAME filters for a specific file. This may be |
| 41 | 41 | ** combined with one of the other filters (useful for looking at a specific |
| 42 | 42 | ** branch). |
| 43 | 43 | */ |
| 44 | - | |
| 45 | 44 | void page_timeline_rss(void){ |
| 46 | 45 | Stmt q; |
| 47 | 46 | int nLine=0; |
| 48 | 47 | char *zPubDate, *zProjectName, *zProjectDescr, *zFreeProjectName=0; |
| 49 | 48 | Blob bSQL; |
| @@ -79,13 +78,13 @@ | ||
| 79 | 78 | blob_zero(&bSQL); |
| 80 | 79 | blob_append_sql( &bSQL, "%s", zSQL1/*safe-for-%s*/ ); |
| 81 | 80 | |
| 82 | 81 | if( zType[0]!='a' ){ |
| 83 | 82 | if( zType[0]=='c' && !g.perm.Read ) zType = "x"; |
| 84 | - if( zType[0]=='w' && !g.perm.RdWiki ) zType = "x"; | |
| 85 | - if( zType[0]=='t' && !g.perm.RdTkt ) zType = "x"; | |
| 86 | - if( zType[0]=='f' && !g.perm.RdForum ) zType = "x"; | |
| 83 | + else if( (zType[0]=='w' || zType[0]=='e') && !g.perm.RdWiki ) zType = "x"; | |
| 84 | + else if( zType[0]=='t' && !g.perm.RdTkt ) zType = "x"; | |
| 85 | + else if( zType[0]=='f' && !g.perm.RdForum ) zType = "x"; | |
| 87 | 86 | blob_append_sql(&bSQL, " AND event.type=%Q", zType); |
| 88 | 87 | }else{ |
| 89 | 88 | blob_append_sql(&bSQL, " AND event.type in ("); |
| 90 | 89 | if( g.perm.Read ){ |
| 91 | 90 | blob_append_sql(&bSQL, "'ci',"); |
| @@ -92,11 +91,11 @@ | ||
| 92 | 91 | } |
| 93 | 92 | if( g.perm.RdTkt ){ |
| 94 | 93 | blob_append_sql(&bSQL, "'t',"); |
| 95 | 94 | } |
| 96 | 95 | if( g.perm.RdWiki ){ |
| 97 | - blob_append_sql(&bSQL, "'w',"); | |
| 96 | + blob_append_sql(&bSQL, "'w','e',"); | |
| 98 | 97 | } |
| 99 | 98 | if( g.perm.RdForum ){ |
| 100 | 99 | blob_append_sql(&bSQL, "'f',"); |
| 101 | 100 | } |
| 102 | 101 | blob_append_sql(&bSQL, "'x')"); |
| 103 | 102 |
| --- src/rss.c | |
| +++ src/rss.c | |
| @@ -39,11 +39,10 @@ | |
| 39 | ** |
| 40 | ** In addition, name=FILENAME filters for a specific file. This may be |
| 41 | ** combined with one of the other filters (useful for looking at a specific |
| 42 | ** branch). |
| 43 | */ |
| 44 | |
| 45 | void page_timeline_rss(void){ |
| 46 | Stmt q; |
| 47 | int nLine=0; |
| 48 | char *zPubDate, *zProjectName, *zProjectDescr, *zFreeProjectName=0; |
| 49 | Blob bSQL; |
| @@ -79,13 +78,13 @@ | |
| 79 | blob_zero(&bSQL); |
| 80 | blob_append_sql( &bSQL, "%s", zSQL1/*safe-for-%s*/ ); |
| 81 | |
| 82 | if( zType[0]!='a' ){ |
| 83 | if( zType[0]=='c' && !g.perm.Read ) zType = "x"; |
| 84 | if( zType[0]=='w' && !g.perm.RdWiki ) zType = "x"; |
| 85 | if( zType[0]=='t' && !g.perm.RdTkt ) zType = "x"; |
| 86 | if( zType[0]=='f' && !g.perm.RdForum ) zType = "x"; |
| 87 | blob_append_sql(&bSQL, " AND event.type=%Q", zType); |
| 88 | }else{ |
| 89 | blob_append_sql(&bSQL, " AND event.type in ("); |
| 90 | if( g.perm.Read ){ |
| 91 | blob_append_sql(&bSQL, "'ci',"); |
| @@ -92,11 +91,11 @@ | |
| 92 | } |
| 93 | if( g.perm.RdTkt ){ |
| 94 | blob_append_sql(&bSQL, "'t',"); |
| 95 | } |
| 96 | if( g.perm.RdWiki ){ |
| 97 | blob_append_sql(&bSQL, "'w',"); |
| 98 | } |
| 99 | if( g.perm.RdForum ){ |
| 100 | blob_append_sql(&bSQL, "'f',"); |
| 101 | } |
| 102 | blob_append_sql(&bSQL, "'x')"); |
| 103 |
| --- src/rss.c | |
| +++ src/rss.c | |
| @@ -39,11 +39,10 @@ | |
| 39 | ** |
| 40 | ** In addition, name=FILENAME filters for a specific file. This may be |
| 41 | ** combined with one of the other filters (useful for looking at a specific |
| 42 | ** branch). |
| 43 | */ |
| 44 | void page_timeline_rss(void){ |
| 45 | Stmt q; |
| 46 | int nLine=0; |
| 47 | char *zPubDate, *zProjectName, *zProjectDescr, *zFreeProjectName=0; |
| 48 | Blob bSQL; |
| @@ -79,13 +78,13 @@ | |
| 78 | blob_zero(&bSQL); |
| 79 | blob_append_sql( &bSQL, "%s", zSQL1/*safe-for-%s*/ ); |
| 80 | |
| 81 | if( zType[0]!='a' ){ |
| 82 | if( zType[0]=='c' && !g.perm.Read ) zType = "x"; |
| 83 | else if( (zType[0]=='w' || zType[0]=='e') && !g.perm.RdWiki ) zType = "x"; |
| 84 | else if( zType[0]=='t' && !g.perm.RdTkt ) zType = "x"; |
| 85 | else if( zType[0]=='f' && !g.perm.RdForum ) zType = "x"; |
| 86 | blob_append_sql(&bSQL, " AND event.type=%Q", zType); |
| 87 | }else{ |
| 88 | blob_append_sql(&bSQL, " AND event.type in ("); |
| 89 | if( g.perm.Read ){ |
| 90 | blob_append_sql(&bSQL, "'ci',"); |
| @@ -92,11 +91,11 @@ | |
| 91 | } |
| 92 | if( g.perm.RdTkt ){ |
| 93 | blob_append_sql(&bSQL, "'t',"); |
| 94 | } |
| 95 | if( g.perm.RdWiki ){ |
| 96 | blob_append_sql(&bSQL, "'w','e',"); |
| 97 | } |
| 98 | if( g.perm.RdForum ){ |
| 99 | blob_append_sql(&bSQL, "'f',"); |
| 100 | } |
| 101 | blob_append_sql(&bSQL, "'x')"); |
| 102 |