From: <jon...@us...> - 2015-03-04 16:45:08
|
Revision: 54236 http://sourceforge.net/p/tikiwiki/code/54236 Author: jonnybradley Date: 2015-03-04 16:45:06 +0000 (Wed, 04 Mar 2015) Log Message: ----------- [bp/r49455][MOD] Add support for notification streams in LIST-like plugins Revision Links: -------------- http://sourceforge.net/p/tikiwiki/code/49455 Modified Paths: -------------- branches/12.x/lib/core/Search/Query/WikiBuilder.php Added Paths: ----------- branches/12.x/templates/activity/tiki.wiki.create.tpl branches/12.x/templates/activity/tiki.wiki.update.tpl Property Changed: ---------------- branches/12.x/ Index: branches/12.x =================================================================== --- branches/12.x 2015-03-04 15:30:40 UTC (rev 54235) +++ branches/12.x 2015-03-04 16:45:06 UTC (rev 54236) Property changes on: branches/12.x ___________________________________________________________________ Modified: svn:mergeinfo ## -20,4 +20,4 ## /branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/experimental/xajax_removal:31497 /branches/proposals/4.x:24005 -/trunk:47899,47958-47959,48372,49124,49418,49421-49422,49464-49465,49483,49494,49531,49552,49554,49576,49699,49702,50161,50224,50235-50236,50389,50486,50619,50627,50636,51161,51181,51195,51238,51250,51252,51264,51266,51273,51276,51282,51289,51291,51303,51308,51323,51329,51335-51337,51631,52489,52515,53048,53138,53144,53155,53162,53194,53257,53269,53359,53435,53503,53521,53580,53584-53585,53605,53623,53661,53681,53762,53765-53766,53768,53771,53775,53792,53870 +/trunk:47899,47958-47959,48372,49124,49418,49421-49422,49455,49464-49465,49483,49494,49531,49552,49554,49576,49699,49702,50161,50224,50235-50236,50389,50486,50619,50627,50636,51161,51181,51195,51238,51250,51252,51264,51266,51273,51276,51282,51289,51291,51303,51308,51323,51329,51335-51337,51631,52489,52515,53048,53138,53144,53155,53162,53194,53257,53269,53359,53435,53503,53521,53580,53584-53585,53605,53623,53661,53681,53762,53765-53766,53768,53771,53775,53792,53870 \ No newline at end of property Modified: branches/12.x/lib/core/Search/Query/WikiBuilder.php =================================================================== --- branches/12.x/lib/core/Search/Query/WikiBuilder.php 2015-03-04 15:30:40 UTC (rev 54235) +++ branches/12.x/lib/core/Search/Query/WikiBuilder.php 2015-03-04 16:45:06 UTC (rev 54236) @@ -218,6 +218,17 @@ if (in_array('follow', $types)) { $subquery->filterMultivalue($targetUser, 'user_followers'); } + + $userId = TikiLib::lib('tiki')->get_user_id($targetUser); + if (in_array('stream_critical', $types)) { + $subquery->filterMultivalue("critical$userId", 'stream'); + } + if (in_array('stream_high', $types)) { + $subquery->filterMultivalue("high$userId", 'stream'); + } + if (in_array('stream_low', $types)) { + $subquery->filterMultivalue("low$userId", 'stream'); + } } function wpquery_sort_mode($query, $value, array $arguments) Copied: branches/12.x/templates/activity/tiki.wiki.create.tpl (from rev 49455, trunk/templates/activity/tiki.wiki.create.tpl) =================================================================== --- branches/12.x/templates/activity/tiki.wiki.create.tpl (rev 0) +++ branches/12.x/templates/activity/tiki.wiki.create.tpl 2015-03-04 16:45:06 UTC (rev 54236) @@ -0,0 +1,6 @@ +{activityframe activity=$activity heading="{tr _0=$activity.user|userlink}%0 created a page{/tr}"} + <p>{object_link type=$activity.type id=$activity.object}</p> + {if is_array($activity.aggregate)} + <small>{$activity.aggregate.user|userlink}</small> + {/if} +{/activityframe} Copied: branches/12.x/templates/activity/tiki.wiki.update.tpl (from rev 49455, trunk/templates/activity/tiki.wiki.update.tpl) =================================================================== --- branches/12.x/templates/activity/tiki.wiki.update.tpl (rev 0) +++ branches/12.x/templates/activity/tiki.wiki.update.tpl 2015-03-04 16:45:06 UTC (rev 54236) @@ -0,0 +1,6 @@ +{activityframe activity=$activity heading="{tr _0=$activity.user|userlink}%0 modified a page{/tr}"} + <p>{object_link type=$activity.type id=$activity.object}</p> + {if is_array($activity.aggregate)} + <small>{$activity.aggregate.user|userlink}</small> + {/if} +{/activityframe} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |