natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only display those filter options for items the user actually has access to

Browse Source 
(fixes issue 655)
This commit is contained in:
Stewart Platt 2011-03-30 00:12:07 +02:00 committed by Thomas Keller
parent 766232f29b
commit 51c6cdb20d
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/IDF/Views/Project.php
View File

@ -62,20 +62,26 @@ class IDF_Views_Project
} }
/** /**
* Returns an associative array with available model filters * Returns an associative array with all accessible model filters
* *
* @return array * @return array
*/ */
private static function getAvailableModelFilters() private function getAccessibleModelFilters($request)
{ {
return array( $filters = array('all' => __('All Updates'));
'all' => __('All Updates'),
'commits' => __('Commits'), if (true === IDF_Precondition::accessSource($request))
'issues' => __('Issues and Comments'), $filters['commits'] = __('Commits');
'downloads' => __('Downloads'), if (true === IDF_Precondition::accessIssues($request))
'documents' => __('Documents'), $filters['issues'] = __('Issues and Comments');
'reviews' => __('Reviews and Patches'), if (true === IDF_Precondition::accessDownloads($request))
); $filters['downloads'] = __('Downloads');
if (true === IDF_Precondition::accessWiki($request))
$filters['documents'] = __('Documents');
if (true === IDF_Precondition::accessReview($request))
$filters['reviews'] = __('Reviews and Patches');
return $filters;
} }
/** /**
@ -141,11 +147,11 @@ class IDF_Views_Project
$prj = $request->project; $prj = $request->project;
$model_filter = @$match[2]; $model_filter = @$match[2];
$all_model_filters = self::getAvailableModelFilters(); $accessible_model_filters = self::getAccessibleModelFilters($request);
if (!array_key_exists($model_filter, $all_model_filters)) { if (!array_key_exists($model_filter, $accessible_model_filters)) {
$model_filter = 'all'; $model_filter = 'all';
} }
$title = (string)$prj . ' ' . $all_model_filters[$model_filter]; $title = (string)$prj . ' ' . $accessible_model_filters[$model_filter];
$pag = new IDF_Timeline_Paginator(new IDF_Timeline()); $pag = new IDF_Timeline_Paginator(new IDF_Timeline());
$pag->class = 'recent-issues'; $pag->class = 'recent-issues';
@ -183,7 +189,7 @@ class IDF_Views_Project
'feedurl' => $feedurl, 'feedurl' => $feedurl,
'timeline' => $pag, 'timeline' => $pag,
'model_filter' => $model_filter, 'model_filter' => $model_filter,
'all_model_filters' => $all_model_filters, 'accessible_model_filters' => $accessible_model_filters,
), ),
$request); $request);
@ -214,11 +220,11 @@ class IDF_Views_Project
$prj = $request->project; $prj = $request->project;
$model_filter = @$match[2]; $model_filter = @$match[2];
$all_model_filters = self::getAvailableModelFilters(); $accessible_model_filters = self::getAccessibleModelFilters($request);
if (!array_key_exists($model_filter, $all_model_filters)) { if (!array_key_exists($model_filter, $accessible_model_filters)) {
$model_filter = 'all'; $model_filter = 'all';
} }
$title = $all_model_filters[$model_filter]; $title = $accessible_model_filters[$model_filter];
$classes = self::determineModelClasses($request, $model_filter); $classes = self::determineModelClasses($request, $model_filter);
$sqls = sprintf('model_class IN (%s)', implode(', ', $classes)); $sqls = sprintf('model_class IN (%s)', implode(', ', $classes));

2
src/IDF/templates/idf/project/timeline.html
View File

@ -15,7 +15,7 @@
{block context} {block context}
<p><span class="label{if 'all' == $model_filter} active{/if}"><a href="{url 'IDF_Views_Project::timeline', array($project.shortname, 'all')}">{trans 'All Updates'}</a></span></p> <p><span class="label{if 'all' == $model_filter} active{/if}"><a href="{url 'IDF_Views_Project::timeline', array($project.shortname, 'all')}">{trans 'All Updates'}</a></span></p>
<p><strong>{trans 'Filter by type'}</strong><br /> <p><strong>{trans 'Filter by type'}</strong><br />
{foreach $all_model_filters as $filter_key => $filter_name} {foreach $accessible_model_filters as $filter_key => $filter_name}
{if $filter_key != 'all'} {if $filter_key != 'all'}
<span class="label{if $filter_key == $model_filter} active{/if}"><a href="{url 'IDF_Views_Project::timeline', array($project.shortname, $filter_key)}">{$filter_name}</a></span><br /> <span class="label{if $filter_key == $model_filter} active{/if}"><a href="{url 'IDF_Views_Project::timeline', array($project.shortname, $filter_key)}">{$filter_name}</a></span><br />
{/if} {/if}