From 51c6cdb20d40a89be2af97e839fadaea333c31db Mon Sep 17 00:00:00 2001 From: Stewart Platt Date: Wed, 30 Mar 2011 00:12:07 +0200 Subject: [PATCH] Only display those filter options for items the user actually has access to (fixes issue 655) --- src/IDF/Views/Project.php | 40 ++++++++++++--------- src/IDF/templates/idf/project/timeline.html | 2 +- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/IDF/Views/Project.php b/src/IDF/Views/Project.php index 2befafc..aa746c9 100644 --- a/src/IDF/Views/Project.php +++ b/src/IDF/Views/Project.php @@ -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 */ - private static function getAvailableModelFilters() + private function getAccessibleModelFilters($request) { - return array( - 'all' => __('All Updates'), - 'commits' => __('Commits'), - 'issues' => __('Issues and Comments'), - 'downloads' => __('Downloads'), - 'documents' => __('Documents'), - 'reviews' => __('Reviews and Patches'), - ); + $filters = array('all' => __('All Updates')); + + if (true === IDF_Precondition::accessSource($request)) + $filters['commits'] = __('Commits'); + if (true === IDF_Precondition::accessIssues($request)) + $filters['issues'] = __('Issues and Comments'); + 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; $model_filter = @$match[2]; - $all_model_filters = self::getAvailableModelFilters(); - if (!array_key_exists($model_filter, $all_model_filters)) { + $accessible_model_filters = self::getAccessibleModelFilters($request); + if (!array_key_exists($model_filter, $accessible_model_filters)) { $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->class = 'recent-issues'; @@ -183,7 +189,7 @@ class IDF_Views_Project 'feedurl' => $feedurl, 'timeline' => $pag, 'model_filter' => $model_filter, - 'all_model_filters' => $all_model_filters, + 'accessible_model_filters' => $accessible_model_filters, ), $request); @@ -214,11 +220,11 @@ class IDF_Views_Project $prj = $request->project; $model_filter = @$match[2]; - $all_model_filters = self::getAvailableModelFilters(); - if (!array_key_exists($model_filter, $all_model_filters)) { + $accessible_model_filters = self::getAccessibleModelFilters($request); + if (!array_key_exists($model_filter, $accessible_model_filters)) { $model_filter = 'all'; } - $title = $all_model_filters[$model_filter]; + $title = $accessible_model_filters[$model_filter]; $classes = self::determineModelClasses($request, $model_filter); $sqls = sprintf('model_class IN (%s)', implode(', ', $classes)); diff --git a/src/IDF/templates/idf/project/timeline.html b/src/IDF/templates/idf/project/timeline.html index 55186ac..92e66d3 100644 --- a/src/IDF/templates/idf/project/timeline.html +++ b/src/IDF/templates/idf/project/timeline.html @@ -15,7 +15,7 @@ {block context}

{trans 'All Updates'}

{trans 'Filter by type'}
-{foreach $all_model_filters as $filter_key => $filter_name} +{foreach $accessible_model_filters as $filter_key => $filter_name} {if $filter_key != 'all'} {$filter_name}
{/if}