Skip to content

Commit 07c06c4

Browse files
Fix html hyperlinks
1 parent 25394a8 commit 07c06c4

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

R/utils_render_reigster_html.r

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ create_index_postfix_html <- function(output_dir, filter, register_table_name, i
7171
# Generating the postfix for non-register table pages (e.g. list of venues and codecheckers)
7272
else{
7373
postfix_template <- readLines(CONFIG$TEMPLATE_DIR[["non_reg"]][["postfix"]], warn = FALSE)
74-
hrefs <- list(
75-
json_href = paste0("https://codecheck.org.uk/register/", filter, "/index.json")
76-
)
74+
hrefs <- generate_html_postfix_hrefs_non_reg(filter, register_table_name)
7775
}
7876

7977
output <- whisker.render(postfix_template, hrefs)

R/utils_render_table_non_registers.R

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ render_non_register_tables_html <- function(list_reg_tables, page_type){
1010
# This is needed when the render function returns a single table which is the
1111
# case when there are not subcategory tables such as the case for codecheckers
1212
if (is.data.frame(output)){
13-
output <- list(page_type = output)
13+
output <- setNames(list(output), page_type)
1414
}
1515
return(output)
1616
}
@@ -192,4 +192,25 @@ generate_html_header <- function(table, page_type, table_name){
192192
)
193193

194194
return(html_header)
195+
}
196+
197+
generate_html_postfix_hrefs_non_reg <- function(filter, register_table_name){
198+
199+
# For register tables that arent of subcategories of a filter type, the
200+
# json url link is register/filter/index.json
201+
if (register_table_name %in% list("all_venues", "codecheckers")){
202+
hrefs <- list(
203+
json_href = paste0("https://codecheck.org.uk/register/", filter, "/index.json")
204+
)
205+
}
206+
207+
# For pages of the filter subcategories, the json url is of form
208+
# filter/register_table_name/index.json where register_table_name is the subcategory name
209+
else{
210+
hrefs <- list(
211+
json_href = paste0("https://codecheck.org.uk/register/", filter, "/", register_table_name,"/index.json")
212+
)
213+
}
214+
215+
return(hrefs)
195216
}

0 commit comments

Comments
 (0)