gitweb: Allow configuring the default projects order and add order 'none'

flichtenheld · Junio C Hamano · commit b06dcf8cb83a · 2007-04-10T17:24:35.000-07:00
Introduce new configuration variable $default_projects_order
that can be used to specify the default order of projects on
the index page if no 'o' parameter is given.

Allow a new value 'none' for order that will cause the projects
to be in the order we learned about them. In case of reading the
list of projects from a file, this should be the order as they are
listed in the file. In case of reading the list of projects from
a directory this will probably give random results depending on the
filesystem in use.

Signed-off-by: Frank Lichtenheld &lt;frank@lichtenheld.de&gt;
Acked-by: Petr Baudis &lt;pasky@suse.cz&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
@@ -71,6 +71,10 @@ BEGIN
 # source of projects list
 our $projects_list = "++GITWEB_LIST++";
 
+# default order of projects list
+# valid values are none, project, descr, owner, and age
+our $default_projects_order = "project";
+
 # show repository only if this file exists
 # (only effective if this variable evaluates to true)
 our $export_ok = "++GITWEB_EXPORT_OK++";
@@ -1131,7 +1135,6 @@ sub git_get_projects_list {
 		}
 		close $fd;
 	}
-	@list = sort {$a->{'path'} cmp $b->{'path'}} @list;
 	return @list;
 }
 
@@ -2618,7 +2621,7 @@ sub git_project_list_body {
 		push @projects, $pr;
 	}
 
-	$order ||= "project";
+	$order ||= $default_projects_order;
 	$from = 0 unless defined $from;
 	$to = $#projects if (!defined $to || $#projects < $to);
 
@@ -2977,7 +2980,7 @@ sub git_search_grep_body {
 
 sub git_project_list {
 	my $order = $cgi->param('o');
-	if (defined $order && $order !~ m/project|descr|owner|age/) {
+	if (defined $order && $order !~ m/none|project|descr|owner|age/) {
 		die_error(undef, "Unknown order parameter");
 	}
 
@@ -3000,7 +3003,7 @@ sub git_project_list {
 
 sub git_forks {
 	my $order = $cgi->param('o');
-	if (defined $order && $order !~ m/project|descr|owner|age/) {
+	if (defined $order && $order !~ m/none|project|descr|owner|age/) {
 		die_error(undef, "Unknown order parameter");
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,10 @@ BEGIN`
`71`	`71`	`# source of projects list`
`72`	`72`	`our $projects_list = "++GITWEB_LIST++";`
`73`	`73`
	`74`	`+# default order of projects list`
	`75`	`+# valid values are none, project, descr, owner, and age`
	`76`	`+our $default_projects_order = "project";`
	`77`	`+`
`74`	`78`	`# show repository only if this file exists`
`75`	`79`	`# (only effective if this variable evaluates to true)`
`76`	`80`	`our $export_ok = "++GITWEB_EXPORT_OK++";`
`@@ -1131,7 +1135,6 @@ sub git_get_projects_list {`
`1131`	`1135`	`}`
`1132`	`1136`	`close $fd;`
`1133`	`1137`	`}`
`1134`		`- @list = sort {$a->{'path'} cmp $b->{'path'}} @list;`
`1135`	`1138`	`return @list;`
`1136`	`1139`	`}`
`1137`	`1140`
`@@ -2618,7 +2621,7 @@ sub git_project_list_body {`
`2618`	`2621`	`push @projects, $pr;`
`2619`	`2622`	`}`
`2620`	`2623`
`2621`		`- $order \|\|= "project";`
	`2624`	`+ $order \|\|= $default_projects_order;`
`2622`	`2625`	`$from = 0 unless defined $from;`
`2623`	`2626`	`$to = $#projects if (!defined $to \|\| $#projects < $to);`
`2624`	`2627`
`@@ -2977,7 +2980,7 @@ sub git_search_grep_body {`
`2977`	`2980`
`2978`	`2981`	`sub git_project_list {`
`2979`	`2982`	`my $order = $cgi->param('o');`
`2980`		`- if (defined $order && $order !~ m/project\|descr\|owner\|age/) {`
	`2983`	`+ if (defined $order && $order !~ m/none\|project\|descr\|owner\|age/) {`
`2981`	`2984`	`die_error(undef, "Unknown order parameter");`
`2982`	`2985`	`}`
`2983`	`2986`
`@@ -3000,7 +3003,7 @@ sub git_project_list {`
`3000`	`3003`
`3001`	`3004`	`sub git_forks {`
`3002`	`3005`	`my $order = $cgi->param('o');`
`3003`		`- if (defined $order && $order !~ m/project\|descr\|owner\|age/) {`
	`3006`	`+ if (defined $order && $order !~ m/none\|project\|descr\|owner\|age/) {`
`3004`	`3007`	`die_error(undef, "Unknown order parameter");`
`3005`	`3008`	`}`
`3006`	`3009`