| Dataset | @@ -230,10 +233,7 @@ class TaglessReportPlugin(p.SingletonPlugin): The last line refers to `tag_report_info` which is a dictionary with properties of the report. This is stored in `reports.py` together with the report code (see above). The info dict looks like this: ```python -try: - from collections import OrderedDict # from python 2.7 -except ImportError: - from sqlalchemy.util import OrderedDict +from collections import OrderedDict tagless_report_info = { 'name': 'tagless-datasets', 'description': 'Datasets which have no tags.', diff --git a/bin/activate b/bin/activate new file mode 100644 index 0000000..982827c --- /dev/null +++ b/bin/activate @@ -0,0 +1,3 @@ +if [ "$VENV_DIR" != "" ]; then + . ${VENV_DIR}/bin/activate +fi diff --git a/bin/build.sh b/bin/build.sh new file mode 100755 index 0000000..d4088e2 --- /dev/null +++ b/bin/build.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash +## +# Build site in CI. +# +set -e + +# Process Docker Compose configuration. This is used to avoid multiple +# docker-compose.yml files. +# Remove lines containing '###'. +sed -i -e "/###/d" docker-compose.yml +# Uncomment lines containing '##'. +sed -i -e "s/##//" docker-compose.yml + +# Pull the latest images. +ahoy pull + +PYTHON=python +if [ "$CKAN_VERSION" = "2.7" ] || [ "$CKAN_VERSION" = "2.8" ] || [ "$CKAN_VERSION" = "2.9-py2" ]; then + PYTHON_VERSION=py2 +else + PYTHON_VERSION=py3 + PYTHON="${PYTHON}3" +fi + +sed "s|{CKAN_VERSION}|$CKAN_VERSION|g" .docker/Dockerfile-template.ckan \ + | sed "s|{PYTHON}|$PYTHON|g" \ + | sed "s|{PYTHON_VERSION}|$PYTHON_VERSION|g" > .docker/Dockerfile.ckan + +ahoy build || (ahoy logs; exit 1) diff --git a/bin/ckan_cli b/bin/ckan_cli new file mode 100644 index 0000000..7757dc8 --- /dev/null +++ b/bin/ckan_cli @@ -0,0 +1,75 @@ +#!/bin/sh + +# Call either 'ckan' (from CKAN >= 2.9) or 'paster' (from CKAN <= 2.8) +# with appropriate syntax, depending on what is present on the system. +# This is intended to smooth the upgrade process from 2.8 to 2.9. +# Eg: +# ckan_cli jobs list +# could become either: +# paster --plugin=ckan jobs list -c /etc/ckan/default/production.ini +# or: +# ckan -c /etc/ckan/default/production.ini jobs list + +# This script is aware of the VIRTUAL_ENV environment variable, and will +# attempt to respect it with similar behaviour to commands like 'pip'. +# Eg placing this script in a virtualenv 'bin' directory will cause it +# to call the 'ckan' or 'paster' command in that directory, while +# placing this script elsewhere will cause it to rely on the VIRTUAL_ENV +# variable, or if that is not set, the system PATH. + +# Since the positioning of the CKAN configuration file is central to the +# differences between 'paster' and 'ckan', this script needs to be aware +# of the config file location. It will use the CKAN_INI environment +# variable if it exists, or default to /etc/ckan/default/production.ini. + +# If 'paster' is being used, the default plugin is 'ckan'. A different +# plugin can be specified by setting the PASTER_PLUGIN environment +# variable. This variable is irrelevant if using the 'ckan' command. + +CKAN_INI="${CKAN_INI:-/etc/ckan/default/production.ini}" +PASTER_PLUGIN="${PASTER_PLUGIN:-ckan}" +# First, look for a command alongside this file +ENV_DIR=$(dirname "$0") +if [ -f "$ENV_DIR/ckan" ]; then + COMMAND=ckan +elif [ -f "$ENV_DIR/paster" ]; then + COMMAND=paster +elif [ "$VIRTUAL_ENV" != "" ]; then + # If command not found alongside this file, check the virtualenv + ENV_DIR="$VIRTUAL_ENV/bin" + if [ -f "$ENV_DIR/ckan" ]; then + COMMAND=ckan + elif [ -f "$ENV_DIR/paster" ]; then + COMMAND=paster + fi +else + # if no virtualenv is active, try the system path + if (which ckan > /dev/null 2>&1); then + ENV_DIR=$(dirname $(which ckan)) + COMMAND=ckan + elif (which paster > /dev/null 2>&1); then + ENV_DIR=$(dirname $(which paster)) + COMMAND=paster + else + echo "Unable to locate 'ckan' or 'paster' command" >&2 + exit 1 + fi +fi + +if [ "$COMMAND" = "ckan" ]; then + # adjust args to match ckan expectations + COMMAND=$(echo "$1" | sed -e 's/create-test-data/seed/') + echo "Using 'ckan' command from $ENV_DIR with config ${CKAN_INI} to run $COMMAND..." >&2 + shift + exec $ENV_DIR/ckan -c ${CKAN_INI} $COMMAND "$@" $CLICK_ARGS +elif [ "$COMMAND" = "paster" ]; then + # adjust args to match paster expectations + COMMAND=$1 + echo "Using 'paster' command from $ENV_DIR with config ${CKAN_INI} to run $COMMAND..." >&2 + shift + if [ "$1" = "show" ]; then shift; fi + exec $ENV_DIR/paster --plugin=$PASTER_PLUGIN $COMMAND "$@" -c ${CKAN_INI} +else + echo "Unable to locate 'ckan' or 'paster' command in $ENV_DIR" >&2 + exit 1 +fi diff --git a/bin/create-test-data.sh b/bin/create-test-data.sh new file mode 100644 index 0000000..79fbdfd --- /dev/null +++ b/bin/create-test-data.sh @@ -0,0 +1,116 @@ +#!/usr/bin/env sh +## +# Create some example content for extension BDD tests. +# +set -e + +CKAN_ACTION_URL=${CKAN_SITE_URL}api/action +CKAN_USER_NAME="${CKAN_USER_NAME:-admin}" +CKAN_DISPLAY_NAME="${CKAN_DISPLAY_NAME:-Administrator}" +CKAN_USER_EMAIL="${CKAN_USER_EMAIL:-admin@localhost}" + +. ${APP_DIR}/bin/activate + +add_user_if_needed () { + echo "Adding user '$2' ($1) with email address [$3]" + ckan_cli user show "$1" | grep "$1" || ckan_cli user add "$1"\ + fullname="$2"\ + email="$3"\ + password="${4:-Password123!}" +} + +add_user_if_needed "$CKAN_USER_NAME" "$CKAN_DISPLAY_NAME" "$CKAN_USER_EMAIL" +ckan_cli sysadmin add "${CKAN_USER_NAME}" + +API_KEY=$(ckan_cli user show "${CKAN_USER_NAME}" | tr -d '\n' | sed -r 's/^(.*)apikey=(\S*)(.*)/\2/') +if [ "$API_KEY" = "None" ]; then + echo "No API Key found on ${CKAN_USER_NAME}, generating API Token..." + API_KEY=$(ckan_cli user token add "${CKAN_USER_NAME}" test_setup |tail -1 | tr -d '[:space:]') +fi + +## +# BEGIN: Create a test organisation with test users for admin, editor and member +# +TEST_ORG_NAME=test-organisation +TEST_ORG_TITLE="Test Organisation" + +echo "Creating test users for ${TEST_ORG_TITLE} Organisation:" + +add_user_if_needed ckan_user "CKAN User" ckan_user@localhost +add_user_if_needed test_org_admin "Test Admin" test_org_admin@localhost +add_user_if_needed test_org_editor "Test Editor" test_org_editor@localhost +add_user_if_needed test_org_member "Test Member" test_org_member@localhost + +echo "Creating ${TEST_ORG_TITLE} organisation:" + +TEST_ORG=$( \ + curl -LsH "Authorization: ${API_KEY}" \ + --data '{"name": "'"${TEST_ORG_NAME}"'", "title": "'"${TEST_ORG_TITLE}"'"}' \ + ${CKAN_ACTION_URL}/organization_create +) + +TEST_ORG_ID=$(echo $TEST_ORG | $PYTHON ${APP_DIR}/bin/extract-id.py) + +echo "Assigning test users to '${TEST_ORG_TITLE}' organisation (${TEST_ORG_ID}):" + +curl -LsH "Authorization: ${API_KEY}" \ + --data '{"id": "'"${TEST_ORG_ID}"'", "object": "test_org_admin", "object_type": "user", "capacity": "admin"}' \ + ${CKAN_ACTION_URL}/member_create + +curl -LsH "Authorization: ${API_KEY}" \ + --data '{"id": "'"${TEST_ORG_ID}"'", "object": "test_org_editor", "object_type": "user", "capacity": "editor"}' \ + ${CKAN_ACTION_URL}/member_create + +curl -LsH "Authorization: ${API_KEY}" \ + --data '{"id": "'"${TEST_ORG_ID}"'", "object": "test_org_member", "object_type": "user", "capacity": "member"}' \ + ${CKAN_ACTION_URL}/member_create +## +# END. +# + +## +# BEGIN: Create a Reporting organisation with test users +# + +REPORT_ORG_NAME=reporting +REPORT_ORG_TITLE=Reporting + +echo "Creating test users for ${REPORT_ORG_TITLE} Organisation:" + +add_user_if_needed report_admin "Reporting Admin" report_admin@localhost +add_user_if_needed report_editor "Reporting Editor" report_editor@localhost + +echo "Creating ${REPORT_ORG_TITLE} Organisation:" + +REPORT_ORG=$( \ + curl -LsH "Authorization: ${API_KEY}" \ + --data '{"name": "'"${REPORT_ORG_NAME}"'", "title": "'"${REPORT_ORG_TITLE}"'"}' \ + ${CKAN_ACTION_URL}/organization_create +) + +REPORT_ORG_ID=$(echo $REPORT_ORG | $PYTHON ${APP_DIR}/bin/extract-id.py) + +echo "Assigning test users to ${REPORT_ORG_TITLE} Organisation:" + +curl -LsH "Authorization: ${API_KEY}" \ + --data '{"id": "'"${REPORT_ORG_ID}"'", "object": "report_admin", "object_type": "user", "capacity": "admin"}' \ + ${CKAN_ACTION_URL}/member_create + +curl -LsH "Authorization: ${API_KEY}" \ + --data '{"id": "'"${REPORT_ORG_ID}"'", "object": "report_editor", "object_type": "user", "capacity": "editor"}' \ + ${CKAN_ACTION_URL}/member_create + +echo "Creating test dataset for reporting:" + +curl -LsH "Authorization: ${API_KEY}" \ + --data '{"name": "reporting", "title": "Reporting dataset", "description": "Dataset for testing reports", +"owner_org": "'"${REPORT_ORG_ID}"'", "update_frequency": "near-realtime", "author_email": "report_admin@localhost", +"version": "1.0", "license_id": "cc-by-4", "data_driven_application": "NO", "security_classification": "PUBLIC", +"notes": "test", "de_identified_data": "NO"}'\ + ${CKAN_ACTION_URL}/package_create + +## +# END. +# + +. ${APP_DIR}/bin/deactivate diff --git a/bin/deactivate b/bin/deactivate new file mode 100644 index 0000000..7cd77b9 --- /dev/null +++ b/bin/deactivate @@ -0,0 +1,3 @@ +if [ "$VENV_DIR" != "" ]; then + deactivate +fi diff --git a/bin/doctor.sh b/bin/doctor.sh new file mode 100755 index 0000000..9c7f455 --- /dev/null +++ b/bin/doctor.sh @@ -0,0 +1,202 @@ +#!/usr/bin/env bash +# +# Check Drupal-Dev project requirements. +# +set -e + +DOCTOR_CHECK_TOOLS="${DOCTOR_CHECK_TOOLS:-1}" +DOCTOR_CHECK_PORT="${DOCTOR_CHECK_PORT:-0}" +DOCTOR_CHECK_PYGMY="${DOCTOR_CHECK_PYGMY:-1}" +DOCTOR_CHECK_CLI="${DOCTOR_CHECK_CLI:-1}" +DOCTOR_CHECK_SSH="${DOCTOR_CHECK_SSH:-0}" +DOCTOR_CHECK_WEBSERVER="${DOCTOR_CHECK_WEBSERVER:-1}" +DOCTOR_CHECK_BOOTSTRAP="${DOCTOR_CHECK_BOOTSTRAP:-1}" + +APP_PORT="${APP_PORT:-5000}" +CLI="${CLI:-cli}" +LAGOON_LOCALDEV_URL="${LAGOON_LOCALDEV_URL:-http://your-site.docker.amazee.io/}" +SSH_KEY_FILE="${SSH_KEY_FILE:-$HOME/.ssh/id_rsa}" +DATAROOT="${DATAROOT:-.data}" + +#------------------------------------------------------------------------------- +# DO NOT CHANGE ANYTHING BELOW THIS LINE +#------------------------------------------------------------------------------- + + +# +# Main entry point. +# +main() { + status "Checking project requirements" + + if [ "${DOCTOR_CHECK_TOOLS}" == "1" ]; then + [ "$(command_exists docker)" == "1" ] && error "Please install Docker (https://www.docker.com/get-started)" && exit 1 + [ "$(command_exists docker-compose)" == "1" ] && error "Please install docker-compose (https://docs.docker.com/compose/install/)" && exit 1 + [ "$(command_exists composer)" == "1" ] && error "Please install Composer (https://getcomposer.org/)" && exit 1 + [ "$(command_exists pygmy)" == "1" ] && error "Please install Pygmy (https://pygmy.readthedocs.io/)" && exit 1 + [ "$(command_exists ahoy)" == "1" ] && error "Please install Ahoy (https://ahoy-cli.readthedocs.io/)" && exit 1 + success "All required tools are present" + fi + + if [ "${DOCTOR_CHECK_PORT}" == "1" ]; then + if ! lsof -i :$APP_PORT | grep LISTEN | grep -q om.docke; then + error "Port $APP_PORT is occupied by a service other than Docker. Stop this service and run 'pygmy up'" + fi + success "Port $APP_PORT is available" + fi + + if [ "${DOCTOR_CHECK_PYGMY}" == "1" ]; then + if ! pygmy status > /dev/null 2>&1; then + error "pygmy is not running. Run 'pygmy up' to start pygmy." + exit 1 + fi + success "Pygmy is running" + fi + + # Check that the stack is running. + if [ "${DOCTOR_CHECK_CLI}" == "1" ]; then + if ! docker ps -q --no-trunc | grep "$(docker-compose ps -q ckan)" > /dev/null 2>&1; then + error "CLI container is not running. Run 'ahoy up'." + exit 1 + fi + success "CLI container is running" + fi + + if [ "${DOCTOR_CHECK_SSH}" == "1" ]; then + # SSH key injection is required to access Lagoon services from within + # containers. For example, to connect to production environment to run + # drush script. + # Pygmy makes this possible in the following way: + # 1. Pygmy starts `amazeeio/ssh-agent` container with a volume `/tmp/amazeeio_ssh-agent` + # 2. Pygmy adds a default SSH key from the host into this volume. + # 3. `docker-compose.yml` should have volume inclusion specified for CLI container: + # ``` + # volumes_from: + # - container:amazeeio-ssh-agent + # ``` + # 4. When CLI container starts, the volume is mounted and an entrypoint script + # adds SSH key into agent. + # @see https://github.com/amazeeio/lagoon/blob/master/images/php/cli/10-ssh-agent.sh + # + # Running `ssh-add -L` within CLI container should show that the SSH key + # is correctly loaded. + # + # As rule of a thumb, one must restart the CLI container after restarting + # Pygmy ONLY if SSH key was not loaded in pygmy before the stack starts. + # No need to restart CLI container if key was added, but pygmy was + # restarted - the volume mount will retain and the key will still be + # available in CLI container. + + # Check that the key is injected into pygmy ssh-agent container. + if ! pygmy status 2>&1 | grep -q "${SSH_KEY_FILE}"; then + error "SSH key is not added to pygmy. Run 'pygmy stop && pygmy start' and then 'ahoy up -- --build'." + exit 1 + fi + + # Check that the volume is mounted into CLI container. + if ! docker exec -i "$(docker-compose ps -q ckan)" sh -c "grep \"^/dev\" /etc/mtab|grep -q /tmp/amazeeio_ssh-agent"; then + error "SSH key is added to Pygmy, but the volume is not mounted into container. Make sure that your your \"docker-compose.yml\" has the following lines:" + error "volumes_from:" + error " - container:amazeeio-ssh-agent" + error "After adding these lines, run 'ahoy up -- --build'" + exit 1 + fi + + # Check that ssh key is available in the container. + if ! docker exec -i "$(docker-compose ps -q ckan)" bash -c "ssh-add -L | grep -q 'ssh-rsa'" ; then + error "SSH key was not added into container. Run 'ahoy up -- --build'." + exit 1 + fi + + success "SSH key is available within CLI container" + fi + + + if [ "${DOCTOR_CHECK_WEBSERVER}" == "1" ]; then + host_app_port="$(docker port $(docker-compose ps -q ckan) $APP_PORT | cut -d : -f 2)" + if ! curl -L -s -o /dev/null -w "%{http_code}" "${LAGOON_LOCALDEV_URL}:${host_app_port}" | grep -q 200; then + error "Web server is not accessible at ${LAGOON_LOCALDEV_URL}:${host_app_port}" + exit 1 + fi + success "Web server is running and accessible at ${LAGOON_LOCALDEV_URL}:${host_app_port}" + fi + + if [ "${DOCTOR_CHECK_BOOTSTRAP}" == "1" ]; then + host_app_port="$(docker port $(docker-compose ps -q ckan) $APP_PORT | cut -d : -f 2)" + if ! curl -L -s -N "${LAGOON_LOCALDEV_URL}:${host_app_port}" | grep -q -i "meta name=\"generator\" content=\"ckan"; then + error "Website is running, but cannot be bootstrapped. Try pulling latest container images with 'ahoy pull'" + exit 1 + fi + success "Successfully bootstrapped website at ${LAGOON_LOCALDEV_URL}:${host_app_port}" + fi + + status "All required checks have passed" +} + +# +# Check that command exists. +# +command_exists() { + local cmd=$1 + command -v "${cmd}" | grep -ohq "${cmd}" + local res=$? + + # Try homebrew lookup, if brew is available. + if command -v "brew" | grep -ohq "brew" && [ "$res" == "1" ] ; then + brew --prefix "${cmd}" > /dev/null + res=$? + fi + + echo ${res} +} + +# +# Status echo. +# +status() { + cecho blue "✚ $1"; +} + +# +# Success echo. +# +success() { + cecho green " ✓ $1"; +} + +# +# Error echo. +# +error() { + cecho red " ✘ $1"; + exit 1 +} + +# +# Colored echo. +# +cecho() { + local prefix="\033[" + local input_color=$1 + local message="$2" + + local color="" + case "$input_color" in + black | bk) color="${prefix}0;30m";; + red | r) color="${prefix}1;31m";; + green | g) color="${prefix}1;32m";; + yellow | y) color="${prefix}1;33m";; + blue | b) color="${prefix}1;34m";; + purple | p) color="${prefix}1;35m";; + cyan | c) color="${prefix}1;36m";; + gray | gr) color="${prefix}0;37m";; + *) message="$1" + esac + + # Format message with color codes, but only if a correct color was provided. + [ -n "$color" ] && message="${color}${message}${prefix}0m" + + echo -e "$message" +} + +main "$@" diff --git a/bin/extract-id.py b/bin/extract-id.py new file mode 100644 index 0000000..ae9cf79 --- /dev/null +++ b/bin/extract-id.py @@ -0,0 +1,5 @@ +# encoding: utf-8 +import json +import sys + +print(json.loads(sys.stdin.read())['result']['id']) diff --git a/bin/init-ext.sh b/bin/init-ext.sh new file mode 100755 index 0000000..4ae5b57 --- /dev/null +++ b/bin/init-ext.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env sh +## +# Install current extension. +# +set -e + +install_requirements () { + PROJECT_DIR=$1 + shift + # Identify the best match requirements file, ignore the others. + # If there is one specific to our Python version, use that. + for filename_pattern in "$@"; do + filename="$PROJECT_DIR/${filename_pattern}-$PYTHON_VERSION.txt" + if [ -f "$filename" ]; then + pip install -r "$filename" + return 0 + fi + done + for filename_pattern in "$@"; do + filename="$PROJECT_DIR/$filename_pattern.txt" + if [ -f "$filename" ]; then + pip install -r "$filename" + return 0 + fi + done +} + +. ${APP_DIR}/bin/activate + +install_requirements . dev-requirements requirements-dev +for extension in . `ls -d $SRC_DIR/ckanext-*`; do + install_requirements $extension requirements pip-requirements +done +pip install -e . +installed_name=$(grep '^\s*name=' setup.py |sed "s|[^']*'\([-a-zA-Z0-9]*\)'.*|\1|") + +# Validate that the extension was installed correctly. +if ! pip list | grep "$installed_name" > /dev/null; then echo "Unable to find the extension in the list"; exit 1; fi + +. ${APP_DIR}/bin/deactivate diff --git a/bin/init.sh b/bin/init.sh new file mode 100755 index 0000000..5610d25 --- /dev/null +++ b/bin/init.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env sh +## +# Initialise CKAN data for testing. +# +set -e + +. ${APP_DIR}/bin/activate +CLICK_ARGS="--yes" ckan_cli db clean +ckan_cli db init +ckan_cli db upgrade + +# Initialise report tables +PASTER_PLUGIN=ckanext-report ckan_cli report initdb +PASTER_PLUGIN=ckanext-report ckan_cli report generate tagless-datasets + +# Create some base test data +. $APP_DIR/bin/create-test-data.sh diff --git a/bin/process-artifacts.sh b/bin/process-artifacts.sh new file mode 100755 index 0000000..6324f60 --- /dev/null +++ b/bin/process-artifacts.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +## +# Process test artifacts. +# +set -e + +# Create screenshots directory in case it was not created before. This is to +# avoid this script to fail when copying artifacts. +ahoy cli "mkdir -p test/screenshots" + +# Copy from the app container to the build host for storage. +mkdir -p /tmp/artifacts/behave +docker cp "$(docker-compose ps -q ckan)":/srv/app/test/screenshots /tmp/artifacts/behave/ diff --git a/bin/serve.sh b/bin/serve.sh new file mode 100755 index 0000000..eafaa3e --- /dev/null +++ b/bin/serve.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env sh +set -e + +dockerize -wait tcp://postgres:5432 -timeout 1m +dockerize -wait tcp://solr:8983 -timeout 1m +dockerize -wait tcp://redis:6379 -timeout 1m + +for i in {1..60}; do + if (PGPASSWORD=pass psql -h postgres -U ckan_default -d ckan_test -c "\q"); then + break + else + sleep 1 + fi +done + +. ${APP_DIR}/bin/activate +if (which ckan > /dev/null); then + ckan -c ${CKAN_INI} run -r +else + paster serve ${CKAN_INI} +fi diff --git a/bin/test.sh b/bin/test.sh new file mode 100755 index 0000000..a2d91da --- /dev/null +++ b/bin/test.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +## +# Run tests in CI. +# +set -e + +echo "==> Lint code" +ahoy lint + +echo "==> Run Unit tests" +ahoy test-unit + +echo "==> Run BDD tests" +ahoy install-site +ahoy test-bdd || (ahoy logs; exit 1) diff --git a/ckanext/__init__.py b/ckanext/__init__.py index 2e2033b..ed48ed0 100644 --- a/ckanext/__init__.py +++ b/ckanext/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + # this is a namespace package try: import pkg_resources diff --git a/ckanext/report/blueprint.py b/ckanext/report/blueprint.py new file mode 100644 index 0000000..8695fbe --- /dev/null +++ b/ckanext/report/blueprint.py @@ -0,0 +1,37 @@ +# encoding: utf-8 + +import six + +from flask import Blueprint, make_response + +from ckan.plugins import toolkit + +from .utils import report_index as index, report_view + + +report = Blueprint(u'report', __name__) + + +def redirect_to_index(): + return toolkit.redirect_to('/report') + + +def view(report_name, organization=None, refresh=False): + body, headers = report_view(report_name, organization, refresh) + if headers: + response = make_response(body) + for key, value in six.iteritems(headers): + response.headers[key] = value + return response + else: + return body + + +report.add_url_rule(u'/report', 'index', view_func=index) +report.add_url_rule(u'/reports', 'reports', view_func=redirect_to_index) +report.add_url_rule(u'/report/
|---|
| {% trans %}Dataset{% endtrans %} | @@ -22,7 +24,7 @@ {% for row in table %}
|---|
| - + {{ row.title }} | diff --git a/ckanext/report/templates/report/view.html b/ckanext/report/templates/report/view.html index f700100..ddc4833 100644 --- a/ckanext/report/templates/report/view.html +++ b/ckanext/report/templates/report/view.html @@ -3,72 +3,66 @@ {% block title %}{{ report.title }} - {{ _('Reports') }} - {{ super() }}{% endblock %} {% block breadcrumb_content %} - {{ h.nav_link(_('Reports'), named_route='report.index') }} - {{ h.nav_link(report.title, named_route='report.org' if '/organization' in request.environ.get('PATH_INFO', '') else 'report.view', report_name=report_name) }} +