Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add submenu entries on timeline pages for selecting options such as "tickets only" and "200 entries per page" and so forth. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
c9cd128c2c2749739e6423fd668a5682 |
User & Date: | drh 2008-11-02 18:22:30.000 |
References
2008-11-03
| ||
13:40 | No changes from [c9cd128c2c]. This checkin merely establishes the "official" branch as distinct from the incompatible MYCFG branch. Use this branch. ... (check-in: db31a1a5 user: drh tags: trunk) | |
2008-11-02
| ||
18:26 | • Fixed ticket [935f17dc]: timeline with the commits only plus 2 other changes ... (artifact: 4a279aa6 user: drh) | |
Context
2008-11-03
| ||
13:40 | No changes from [c9cd128c2c]. This checkin merely establishes the "official" branch as distinct from the incompatible MYCFG branch. Use this branch. ... (check-in: db31a1a5 user: drh tags: trunk) | |
09:55 | Update for making mycfg.exe. WARNING: This is an incompatible change. Do not use this branch of development to build a copy of fossil that needs to interoperate with official releases. ... (check-in: b54de50a user: urmil tags: trunk) | |
2008-11-02
| ||
18:22 | Add submenu entries on timeline pages for selecting options such as "tickets only" and "200 entries per page" and so forth. ... (check-in: c9cd128c user: drh tags: trunk) | |
2008-11-01
| ||
20:56 | Make UTC time display the default. You can still set up a server to show localtime but that requires changing a setting under setup/timeline. ... (check-in: 0b36f02f user: drh tags: trunk) | |
Changes
Changes to src/timeline.c.
︙ | ︙ | |||
209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 | @ coalesce(bgcolor, brbgcolor), @ event.type @ FROM event JOIN blob @ WHERE blob.rid=event.objid ; return zBaseSql; } /* ** WEBPAGE: timeline ** ** Query parameters: ** ** a=TIMESTAMP after this date ** b=TIMESTAMP before this date. ** n=COUNT number of events in output ** p=RID artifact RID and up to COUNT parents and ancestors ** d=RID artifact RID and up to COUNT descendants ** u=USER only if belonging to this user | > > > > > > > > > > > > > > | | > | 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 | @ coalesce(bgcolor, brbgcolor), @ event.type @ FROM event JOIN blob @ WHERE blob.rid=event.objid ; return zBaseSql; } /* ** Generate a submenu element with a single parameter change. */ static void timeline_submenu( HQuery *pUrl, /* Base URL */ const char *zMenuName, /* Submenu name */ const char *zParam, /* Parameter value to add or change */ const char *zValue, /* Value of the new parameter */ const char *zRemove /* Parameter to omit */ ){ style_submenu_element(zMenuName, zMenuName, "%s", url_render(pUrl, zParam, zValue, zRemove, 0)); } /* ** WEBPAGE: timeline ** ** Query parameters: ** ** a=TIMESTAMP after this date ** b=TIMESTAMP before this date. ** n=COUNT number of events in output ** p=RID artifact RID and up to COUNT parents and ancestors ** d=RID artifact RID and up to COUNT descendants ** u=USER only if belonging to this user ** y=TYPE 'ci', 'w', 't' ** ** p= and d= can appear individually or together. If either p= or d= ** appear, then u=, y=, a=, and b= are ignored. ** ** If a= and b= appear, only a= is used. If neither appear, the most ** recent events are choosen. ** ** If n= is missing, the default count is 20. */ void page_timeline(void){ Stmt q; /* Query used to generate the timeline */ Blob sql; /* text of SQL used to generate timeline */ Blob desc; /* Description of the timeline */ int nEntry = atoi(PD("n","20")); /* Max number of entries on timeline */ int p_rid = atoi(PD("p","0")); /* artifact p and its parents */ int d_rid = atoi(PD("d","0")); /* artifact d and its descendants */ const char *zUser = P("u"); /* All entries by this user if not NULL */ const char *zType = PD("y","all"); /* Type of events. All if NULL */ const char *zAfter = P("a"); /* Events after this time */ const char *zBefore = P("b"); /* Events before this time */ HQuery url; /* URL for various branch links */ /* To view the timeline, must have permission to read project data. */ login_check_credentials(); if( !g.okRead ){ login_needed(); return; } style_header("Timeline"); |
︙ | ︙ | |||
295 296 297 298 299 300 301 | g.zBaseURL, zUuid, zUuid); }else{ blob_appendf(&desc, " of [%.10s]", zUuid); } db_prepare(&q, "SELECT * FROM timeline ORDER BY timestamp DESC"); }else{ int n; | < | > | | | | | > > > > > > | > | > > > > > > > > > > > > > > > > > > > | 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 | g.zBaseURL, zUuid, zUuid); }else{ blob_appendf(&desc, " of [%.10s]", zUuid); } db_prepare(&q, "SELECT * FROM timeline ORDER BY timestamp DESC"); }else{ int n; const char *zEType = "event"; char *zDate; char *zNEntry = mprintf("%d", nEntry); url_initialize(&url, "timeline"); url_add_parameter(&url, "n", zNEntry); if( zType[0]!='a' ){ blob_appendf(&sql, " AND event.type=%Q", zType); url_add_parameter(&url, "y", zType); if( zType[0]=='c' ){ zEType = "checkin"; }else if( zType[0]=='w' ){ zEType = "wiki edit"; }else if( zType[0]=='t' ){ zEType = "ticket change"; } } if( zUser ){ blob_appendf(&sql, " AND event.user=%Q", zUser); url_add_parameter(&url, "u", zUser); } if( zAfter ){ while( isspace(zAfter[0]) ){ zAfter++; } if( zAfter[0] ){ blob_appendf(&sql, " AND event.mtime>=(SELECT julianday(%Q, 'utc'))" " ORDER BY event.mtime ASC", zAfter); url_add_parameter(&url, "a", zAfter); zBefore = 0; }else{ zAfter = 0; } }else if( zBefore ){ while( isspace(zBefore[0]) ){ zBefore++; } if( zBefore[0] ){ blob_appendf(&sql, " AND event.mtime<=(SELECT julianday(%Q, 'utc'))" " ORDER BY event.mtime DESC", zBefore); url_add_parameter(&url, "b", zBefore); }else{ zBefore = 0; } }else{ blob_appendf(&sql, " ORDER BY event.mtime DESC"); } blob_appendf(&sql, " LIMIT %d", nEntry); db_multi_exec("%s", blob_str(&sql)); n = db_int(0, "SELECT count(*) FROM timeline"); if( n<nEntry && zAfter ){ cgi_redirect(url_render(&url, "a", 0, "b", 0)); } if( zAfter==0 && zBefore==0 ){ blob_appendf(&desc, "%d most recent %ss", n, zEType); }else{ blob_appendf(&desc, "%d %ss", n, zEType); } if( zUser ){ blob_appendf(&desc, " by user %h", zUser); } if( zAfter ){ blob_appendf(&desc, " occurring on or after %h.<br>", zAfter); }else if( zBefore ){ blob_appendf(&desc, " occurring on or before %h.<br>", zBefore); } if( g.okHistory ){ if( zAfter || n==nEntry ){ zDate = db_text(0, "SELECT min(timestamp) FROM timeline"); timeline_submenu(&url, "Older", "b", zDate, "a"); free(zDate); } if( zBefore || (zAfter && n==nEntry) ){ zDate = db_text(0, "SELECT max(timestamp) FROM timeline"); timeline_submenu(&url, "Newer", "a", zDate, "b"); free(zDate); }else{ if( zType[0]!='a' ){ timeline_submenu(&url, "All Types", "y", "all", 0); } if( zType[0]!='w' ){ timeline_submenu(&url, "Wiki Only", "y", "w", 0); } if( zType[0]!='c' ){ timeline_submenu(&url, "Checkins Only", "y", "ci", 0); } if( zType[0]!='t' ){ timeline_submenu(&url, "Tickets Only", "y", "t", 0); } } if( nEntry>20 ){ timeline_submenu(&url, "20 Events", "n", "20", 0); } if( nEntry<200 ){ timeline_submenu(&url, "200 Events", "n", "200", 0); } } } blob_zero(&sql); db_prepare(&q, "SELECT * FROM timeline ORDER BY timestamp DESC"); @ <h2>%b(&desc)</h2> blob_reset(&desc); |
︙ | ︙ |
Changes to src/url.c.
︙ | ︙ | |||
171 172 173 174 175 176 177 | char *zOriginalHost = g.urlHostname; if( zMsg ) printf("%s%s\n", zMsg, zProxy); url_parse(zProxy); g.urlPath = zOriginalUrl; g.urlHostname = zOriginalHost; } } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | char *zOriginalHost = g.urlHostname; if( zMsg ) printf("%s%s\n", zMsg, zProxy); url_parse(zProxy); g.urlPath = zOriginalUrl; g.urlHostname = zOriginalHost; } } #if INTERFACE /* ** An instance of this object is used to build a URL with query parameters. */ struct HQuery { Blob url; /* The URL */ const char *zBase; /* The base URL */ int nParam; /* Number of parameters. Max 10 */ const char *azName[10]; /* Parameter names */ const char *azValue[10]; /* Parameter values */ }; #endif /* ** Initialize the URL object. */ void url_initialize(HQuery *p, const char *zBase){ blob_zero(&p->url); p->zBase = zBase; p->nParam = 0; } /* ** Add a fixed parameter to an HQuery. */ void url_add_parameter(HQuery *p, const char *zName, const char *zValue){ assert( p->nParam < count(p->azName) ); assert( p->nParam < count(p->azValue) ); p->azName[p->nParam] = zName; p->azValue[p->nParam] = zValue; p->nParam++; } /* ** Render the URL with a parameter override. */ char *url_render( HQuery *p, /* Base URL */ const char *zName1, /* First override */ const char *zValue1, /* First override value */ const char *zName2, /* Second override */ const char *zValue2 /* Second override value */ ){ const char *zSep = "?"; int i; blob_reset(&p->url); blob_appendf(&p->url, "%s/%s", g.zBaseURL, p->zBase); for(i=0; i<p->nParam; i++){ const char *z = p->azValue[i]; if( zName1 && strcmp(zName1,p->azName[i])==0 ){ zName1 = 0; z = zValue1; if( z==0 ) continue; } if( zName2 && strcmp(zName2,p->azName[i])==0 ){ zName2 = 0; z = zValue2; if( z==0 ) continue; } blob_appendf(&p->url, "%s%s=%T", zSep, p->azName[i], z); zSep = "&"; } if( zName1 && zValue1 ){ blob_appendf(&p->url, "%s%s=%T", zSep, zName1, zValue1); } if( zName2 && zValue2 ){ blob_appendf(&p->url, "%s%s=%T", zSep, zName2, zValue2); } return blob_str(&p->url); } |