Skip to content
Snippets Groups Projects
Commit fe117276 authored by Thorge Petersen's avatar Thorge Petersen
Browse files

Updated controller to blueprints. Webassets need to be readded (also to templates)

parent 8ccabeee
No related branches found
No related tags found
2 merge requests!41Version 2.0.0,!38Merge py3 into dev
Showing
with 27 additions and 72 deletions
......@@ -11,7 +11,7 @@ class LatestDatasetController(PackageController):
latest_dataset= get_latest_dataset(id)
if latest_dataset is None:
toolkit.abort(404)
toolkit.redirect_to(controller='package', action='read', id=latest_dataset)
toolkit.redirect_to(controller='dataset', action='read', id=latest_dataset)
class LatestRecourcesController(PackageController):
......@@ -30,7 +30,7 @@ class LatestRecourcesController(PackageController):
if is_url(pre_resource_url):
url_resource = pre_resource_url
else:
url_resource = url_for(controller='package',
url_resource = url_for(controller='dataset',
action='resource_download',
id=download_package_id,
resource_id=download_resource_id,
......
......@@ -151,7 +151,7 @@ def gather_collection_info(collection_dict, datasets_in_collection, dataset_dict
}
def url_from_id(package_id):
return helpers.url_for(controller='package', action='read', id=package_id)
return helpers.url_for(controller='dataset', action='read', id=package_id)
def url_last_member(name_collection):
return helpers.url_for(
......
......@@ -51,7 +51,7 @@ class OdshUserController(UserController):
h.redirect_to(locale=locale, controller='user', action='login',
id=None)
user_ref = c.userobj.get_reference_preferred_for_uri()
h.redirect_to(locale=locale, controller='package', action='search')
h.redirect_to(locale=locale, controller='dataset', action='search')
def dashboard(self, id=None, offset=0):
if not authz.is_sysadmin(c.user):
......@@ -223,7 +223,7 @@ class OdshFeedController(FeedController):
navigation_urls = self._navigation_urls(request.params,
item_count=item_count,
limit=data_dict['rows'],
controller='feed',
controller='feeds',
action='custom')
feed_url = self._feed_url(request.params,
......
......@@ -434,7 +434,7 @@ def get_package_dict(name):
def tpsh_get_successor_and_predecessor_urls(context, pkg_dict):
successor_name, predecessor_name = tpsh_get_successor_and_predecessor_dataset(context, pkg_dict)
successor_url, predecessor_url = (
helpers.url_for(controller='package', action='read', id=name)
helpers.url_for(controller='dataset', action='read', id=name)
if name is not None
else None
for name in (successor_name, predecessor_name)
......
......@@ -206,7 +206,7 @@ def get_address_org(organization):
def get_body_mail(organization, package):
package_name = package.get('name')
url = helpers.url_for(controller='package', action='read', id=package_name, qualified = True)
url = helpers.url_for(controller='dataset', action='read', id=package_name, qualified = True)
title = package.get('title')
anrede = "Sehr geehrte Damen und Herren," + "%0D%0A" + "%0D%0A" + "zu folgendem Eintrag habe ich eine Anmerkung/Frage:" + "%0D%0A" + "%0D%0A"
mail_titel = "Titel: " + title + "%0D%0A"
......
......@@ -16,7 +16,7 @@ def get_download_link_for_thumbnail(package):
if is_url(pre_resource_url):
url_resource = pre_resource_url
else:
url_resource = url_for(controller='package',
url_resource = url_for(controller='dataset',
action='resource_download',
id=package_id,
resource_id=resource_id,
......
......@@ -6,6 +6,7 @@ from multiline_formatter.formatter import MultilineMessagesFormatter
import os
from routes.mapper import SubMapper
import sys
from collections import OrderedDict
# imports from ckan
import ckan.lib.helpers as helpers
......
......@@ -186,7 +186,7 @@ class ODSHDCATdeProfile(DCATdeProfile):
@staticmethod
def _construct_refs(id):
public_url = config.get('ckan.site_url')
url_to_id = helpers.url_for(controller='package', action='read', id=id)
url_to_id = helpers.url_for(controller='dataset', action='read', id=id)
ref = public_url + url_to_id
return ref
......
......@@ -2,11 +2,9 @@
{% block styles %}
{{ super() }}
{% resource 'odsh/odsh.js' %}
<link rel="stylesheet" href="/odsh.css?refresh={{ range(1,10000) | random }}" />
<link rel="stylesheet" href="/odsh_header.css?refresh={{ range(1,10000) | random }}" />
<link rel="stylesheet" href="/bootstrap-multiselect.css" />
{% resource 'odsh/autocomplete' %}
{% endblock %}
{% block head_extras %}
......
......@@ -70,7 +70,7 @@
<th scope="row" class="dataset-label">{{ _('Accepted Dataset') }}</th>
<td class="dataset-details">
{% if c.datarequest.accepted_dataset %}
{% link_for c.datarequest.accepted_dataset['title'], controller='package', action='read', id=c.datarequest.accepted_dataset.get('id') %}
{% link_for c.datarequest.accepted_dataset['title'], controller='dataset', action='read', id=c.datarequest.accepted_dataset.get('id') %}
{% else %}
{{ _('None') }}
{% endif %}
......
{% import 'macros/form.html' as form %}
{% resource "datarequest/edit_comment.js" %}
<form class="dataset-form {{ 'comment-edit-form' if comment_id else 'odsh-comment-wrapper' }} {{ 'hide' if comment_id and not (focus and errors) }} form-horizontal" id="comment-form{{ '-' + comment_id if comment_id }}" method="post" data-module="basic-form" action enctype="multipart/form-data">
......
{% extends "page.html" %}
{% block subtitle %}{{ gettext('Error %(error_code)s', error_code=c.code[0]) }}{% endblock %}
{% block primary %}
<article class="module">
<div class="module-content error-page">
<div class="error-title">
HTTP Status {{ c.code[0]}}
{%if c.code[0]=='404' or c.code[0]=='403'%}
{%if c.code[0]=='404'%}
<div class="error-body"><h2>Seite nicht gefunden</h2>
{%elif c.code[0]=='403'%}
<div class="error-body"><h2>Zugriff nicht erlaubt</h2>
{% endif %}
<h3>Wie finde ich die gesuchten Inhalte im Landesportal?</h3>
<p><a class="" href="http://www.schleswig-holstein.de/odpstart" title="Zur Startseite">Zur Startseite des Open-Data-Portals</a></p>
<h3>Kontakt</h3>
<p>Bei Fragen oder Problemen mit dem Open-Data-Portal schicken Sie bitte eine E-Mail an die Adresse opendata@lr.landsh.de oder verwenden das Kontaktformular:</p>
<p><a class="" href="https://www.schleswig-holstein.de/odpkontakt" title="Kontakt">Zum Kontaktformular</a></p>
</div>
{% endif %}
</div>
</div>
</article>
{% endblock %}
{% block breadcrumb %}
{% endblock %}
{% block flash %}
{# eat the flash messages caused by the 404 #}
{% set flash_messages = h.flash.pop_messages() %}
{% endblock %}
{% block secondary %}{% endblock %}
{% resource 'odsh/tpsh_toggle_menu.js' %}
{% block header_wrapper %}
{% block header_account %}
......@@ -45,8 +44,7 @@
{{
h.build_nav_main(
('search', _('Datensätze')),
('organizations_index', _('Herausgeber')),
('info_page', _('Infos'))
('organizations_index', _('Herausgeber'))
)
}}
{% endblock %}
......@@ -56,7 +54,6 @@
<a href="/harvest">Harvester</a>
</li>
<li class='{{clazz}}'>
{% link_for _('Upload'), controller='package', action='new', group=c.group_dict.id, class_='text' %}
</li>
{% endif %}
{% if c.userobj %}
......
......@@ -26,7 +26,7 @@ Datensätze entdecken
<div class='home-groups-rows'>
{% for group in group_row %}
{% if group != '' %}
{% set href = h.add_url_param(controller='package', action='search',extras={'groups':group.id} ) %}
{% set href = h.add_url_param(controller='dataset', action='search',extras={'groups':group.id} ) %}
<div class='home_group_item'>
<div class='home-groups-img'>
<img src="/base/images/icon_kat_{{group.id}}.svg"/>
......
......@@ -2,7 +2,7 @@
{% block page_primary_action %}
{% if h.check_access('package_create', {'owner_org': c.group_dict.id}) %}
{% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary',
{% link_for _('Add Dataset'), controller='dataset', action='new', group=c.group_dict.id, class_='btn btn-primary',
icon='plus-square' %}
{% endif %}
{% endblock %}
......
......@@ -14,12 +14,12 @@
<li>{% link_for _('Organizations'), controller='organization', action='index' %}</li>
<li>{% link_for organization|truncate(30), controller='organization', action='read', id=pkg.organization.name %}</li>
{% else %}
<li>{% link_for _('Datasets'), controller='package', action='search' %}</li>
<li>{% link_for _('Datasets'), controller='dataset', action='search' %}</li>
{% endif %}
<li {{ self.breadcrumb_content_selected() }}>{% link_for dataset|truncate(30), controller='package', action='read',
<li {{ self.breadcrumb_content_selected() }}>{% link_for dataset|truncate(30), controller='dataset', action='read',
id=pkg.name %}</li>
{% else %}
<li>{% link_for _('Datasets'), controller='package', action='search' %}</li>
<li>{% link_for _('Datasets'), controller='dataset', action='search' %}</li>
<li class="active"><a href="">{{ _('Create Dataset') }}</a></li>
{% endif %}
{% endblock %}
\ No newline at end of file
......@@ -7,7 +7,7 @@
{% block breadcrumb_content %}
{% if pkg %}
<li class="active">{% link_for _('Edit'), controller='package', action='edit', id=pkg.name %}</li>
<li class="active">{% link_for _('Edit'), controller='dataset', action='edit', id=pkg.name %}</li>
{% else %}
<li class="active"><a href="">{{ _('odsh Create Dataset') }}</a></li>
{% endif %}
......@@ -23,7 +23,7 @@
{% block primary_content %}
<div class="odsh-dataset-heading">
<div class='title'>Datensatz &quot;{{h.dataset_display_name(pkg)}}&quot; bearbeiten</div>
{% link_for _('back'), controller='package', action='read', id=pkg.name, class_='btn btn-heading', icon='arrow-left' %}
{% link_for _('back'), controller='dataset', action='read', id=pkg.name, class_='btn btn-heading', icon='arrow-left' %}
<span class="clear"></span>
</div>
{{ super() }}
......
......@@ -21,5 +21,4 @@ dataset_type=dataset_type %}{% endblock %}
{% block scripts %}
{{ super() }}
{% resource 'vendor/fileupload' %}
{% endblock %}
......@@ -16,12 +16,12 @@
{% set organization = h.get_translated(pkg.organization, 'title') or pkg.organization.name %}
<li>{% link_for organization|truncate(30), controller='organization', action='read', id=pkg.organization.name %}</li>
{% else %}
<li>{% link_for _('Datasets'), controller='package', action='search' %}</li>
<li>{% link_for _('Datasets'), controller='dataset', action='search' %}</li>
{% endif %}
<li {{ self.breadcrumb_content_selected() }}>{% link_for dataset|truncate(30), controller='package', action='read',
<li {{ self.breadcrumb_content_selected() }}>{% link_for dataset|truncate(30), controller='dataset', action='read',
id=pkg.name %}</li>
{% else %}
<li>{% link_for _('Datasets'), controller='package', action='search' %}</li>
<li>{% link_for _('Datasets'), controller='dataset', action='search' %}</li>
<li class="active"><a href="">{{ _('Create Dataset') }}</a></li>
{% endif %}
{% endblock breadcrumb_content %}
......@@ -43,7 +43,7 @@
<div class="odsh-dataset-edit-button">
{% if h.check_access('package_update', {'id':pkg.id }) %}
<div>
{% link_for _('Manage Dataset'), controller='package', action='edit', id=pkg.name, class_='btn btn-primary btn-add-dataset',
{% link_for _('Manage Dataset'), controller='dataset', action='edit', id=pkg.name, class_='btn btn-primary btn-add-dataset',
icon='wrench' %}
</div>
{% endif %}
......@@ -88,7 +88,7 @@
{% snippet "package/snippets/resources_list.html", pkg=pkg, resources=pkg.resources %}
{% if h.check_access('package_update', {'id':pkg.id }) %}
<div class='add-resource-container'>
{% link_for _('Add new resource'), controller='package', action='new_resource', id=c.pkg_dict.name, class_='btn btn-primary', icon='plus' %}
{% link_for _('Add new resource'), controller='resource', action='new', id=c.pkg_dict.name, class_='btn btn-primary', icon='plus' %}
</div>
{% endif %}
{% endblock package_resources %}
......
......@@ -8,7 +8,7 @@
{% block breadcrumb_content %}
{{ super() }}
{% if res %}
<li>{% link_for h.resource_display_name(res)|truncate(30), controller='package', action='resource_read', id=pkg.name, resource_id=res.id %}</li>
<li>{% link_for h.resource_display_name(res)|truncate(30), controller='resource', action='read', id=pkg.name, resource_id=res.id %}</li>
<li{% block breadcrumb_edit_selected %} class="active"{% endblock %}><a href="">{{ _('Edit') }}</a></li>
{% endif %}
{% endblock %}
......@@ -25,7 +25,7 @@
{% if res %}
<div class="odsh-dataset-heading">
<span class='title'>Ressource {%if(res.name)%}&#65282;{{res.name}}&#65282;{%endif%} bearbeiten</span>
{% link_for _('back'), controller='package', action='resource_read', id=pkg.name, resource_id=res.id, class_='btn btn-heading', icon='arrow-left' %}
{% link_for _('back'), controller='resource', action='read', id=pkg.name, resource_id=res.id, class_='btn btn-heading', icon='arrow-left' %}
<span class="clear"></span>
</div>
{% endif %}
......@@ -40,5 +40,4 @@
{% block scripts %}
{{ super() }}
{% resource 'vendor/fileupload' %}
{% endblock %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment