Skip to content

Commit

Permalink
add OConly icons in new logs lists; updates #814
Browse files Browse the repository at this point in the history
  • Loading branch information
following5 committed Jan 18, 2016
1 parent 1ecd42f commit f903de4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions htdocs/newlogs.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@
`cacheloguser`.`username`, `cacheloguser`.`username`,
`cache_logs`.`cache_id`, `cache_logs`.`cache_id`,
`cache_rating`.`rating_date` IS NOT NULL AS `recommended`, `cache_rating`.`rating_date` IS NOT NULL AS `recommended`,
`caches_attributes`.`attrib_id` IS NOT NULL as `oconly`,
'' AS `pic_uuid`, '' AS `pic_uuid`,
0 AS `picshown`, 0 AS `picshown`,
(SELECT COUNT(*) FROM `pictures` WHERE `object_type`=1 AND `object_id`=`cache_logs`.`id`) AS `pics` (SELECT COUNT(*) FROM `pictures` WHERE `object_type`=1 AND `object_id`=`cache_logs`.`id`) AS `pics`
Expand All @@ -172,6 +173,7 @@
LEFT JOIN `sys_trans_text` ON `countries`.`trans_id`=`sys_trans_text`.`trans_id` AND `sys_trans_text`.`lang`='&1' LEFT JOIN `sys_trans_text` ON `countries`.`trans_id`=`sys_trans_text`.`trans_id` AND `sys_trans_text`.`lang`='&1'
LEFT JOIN `cache_logs_restored` ON `cache_logs_restored`.`id`=`cache_logs`.`id` LEFT JOIN `cache_logs_restored` ON `cache_logs_restored`.`id`=`cache_logs`.`id`
LEFT JOIN `cache_rating` ON `cache_rating`.`cache_id`=`caches`.`cache_id` AND `cache_rating`.`user_id`=`cache_logs`.`user_id` AND `cache_rating`.`rating_date`=`cache_logs`.`date` LEFT JOIN `cache_rating` ON `cache_rating`.`cache_id`=`caches`.`cache_id` AND `cache_rating`.`user_id`=`cache_logs`.`user_id` AND `cache_rating`.`rating_date`=`cache_logs`.`date`
LEFT JOIN `caches_attributes` ON `caches_attributes`.`cache_id`=`caches`.`cache_id` AND `caches_attributes`.`attrib_id`=6
WHERE IFNULL(`cache_logs_restored`.`restored_by`,0)=0 WHERE IFNULL(`cache_logs_restored`.`restored_by`,0)=0
ORDER BY " . $orderByCountry . $orderByDate . "`cache_logs`.`date_created` DESC", ORDER BY " . $orderByCountry . $orderByDate . "`cache_logs`.`date_created` DESC",
$opt['template']['locale']); $opt['template']['locale']);
Expand Down
1 change: 1 addition & 0 deletions htdocs/templates2/ocstyle/newlogs.tpl
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
{if $newLog.oc_team_comment}<img src="resource2/{$opt.template.style}/images/oclogo/oc-team-comment.png" alt="OC-Team" title="{t}OC team comment{/t}" />{/if} {if $newLog.oc_team_comment}<img src="resource2/{$opt.template.style}/images/oclogo/oc-team-comment.png" alt="OC-Team" title="{t}OC team comment{/t}" />{/if}
{capture name=cachename} {capture name=cachename}
<a href="viewcache.php?wp={$newLog.wp_oc}&log=A#log{$newLog.id}">{if $newLog.first}<b>{$newLog.cachename|escape}</b>{else}{$newLog.cachename|escape}{/if}</a> <a href="viewcache.php?wp={$newLog.wp_oc}&log=A#log{$newLog.id}">{if $newLog.first}<b>{$newLog.cachename|escape}</b>{else}{$newLog.cachename|escape}{/if}</a>
{include file="res_oconly.tpl" oconly=$newLog.oconly}
{/capture} {/capture}
{capture name=username} {capture name=username}
<a href="viewprofile.php?userid={$newLog.user_id}">{$newLog.username|escape}</a> <a href="viewprofile.php?userid={$newLog.user_id}">{$newLog.username|escape}</a>
Expand Down

0 comments on commit f903de4

Please sign in to comment.