Skip to content

Commit

Permalink
Add bulk upload resource to new dataset
Browse files Browse the repository at this point in the history
  • Loading branch information
blagojabozinovski committed Apr 14, 2024
1 parent 3943bca commit 7ce75f1
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 19 deletions.
6 changes: 0 additions & 6 deletions ckanext/bulkupload/actions.py

This file was deleted.

11 changes: 0 additions & 11 deletions ckanext/bulkupload/plugin.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import ckan.plugins as plugins
import ckan.plugins.toolkit as toolkit
import ckanext.bulkupload.actions as actions
import ckanext.bulkupload.auth as auth
from ckanext.bulkupload.views import bulkupload
from ckan.lib.plugins import DefaultTranslation
Expand All @@ -9,7 +8,6 @@
class BulkuploadPlugin(plugins.SingletonPlugin, DefaultTranslation):
plugins.implements(plugins.IConfigurer)
plugins.implements(plugins.IBlueprint)
plugins.implements(plugins.IActions)
plugins.implements(plugins.IAuthFunctions)
plugins.implements(plugins.ITranslation)

Expand All @@ -20,15 +18,6 @@ def update_config(self, config_):
toolkit.add_public_directory(config_, 'public')
toolkit.add_resource('fanstatic', 'bulkupload')

# IActions

def get_actions(self):

return {
"call_add_resouce_api": actions.call_add_resouce_api,

}

# IAuthFunctions

def get_auth_functions(self):
Expand Down
27 changes: 27 additions & 0 deletions ckanext/bulkupload/templates/package/new_resource.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{% extends "package/base_form_page.html" %}

{% set logged_in = true if c.userobj else false %}

{% block subtitle %}{{ _('Add data to the dataset') }}{% endblock %}

{% block breadcrumb_content_selected %}{% endblock %}
{% block breadcrumb_content %}
{{ super() }}
{% if pkg %}
<li class="active"><a href="#">{{ _('Add New Resource') }}</a></li>
{% endif %}
{% endblock %}

{% block form %}{% snippet resource_form_snippet, data=data, errors=errors, error_summary=error_summary, include_metadata=false, pkg_name=pkg_name, stage=stage, dataset_type=dataset_type %}{% endblock %}

{% block secondary_content %}
{% snippet 'package/snippets/resource_help.html' %}
<div style="margin: 20px;">
<li class="btn btn-default">{% link_for _('Bulk Upload'), named_route='bulkupload.bulk_resource_upload', pkg_name=pkg_name, icon='plus-square' %}</li>
</div>
{% endblock %}

{% block scripts %}
{{ super() }}
{% asset 'vendor/fileupload' %}
{% endblock %}
11 changes: 9 additions & 2 deletions ckanext/bulkupload/views.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from flask import Blueprint
from flask import request
from ckan.common import config
import ckan.model as model
import ckan.logic as logic
Expand Down Expand Up @@ -69,12 +68,20 @@ def bulk_resource_upload(pkg_name):
form_data = clean_dict(
dict_fns.unflatten(tuplize_dict(parse_params(tk.request.form)))
)
print(form_data['author'])
pkg_name_dict = {
'id': pkg_name,
}
pkg_dict = get.package_show(context, pkg_name_dict)
uploaded_files = flask.request.files.getlist("file[]")

# For newly created datasets
if pkg_dict['state'] != 'active':
patch_package_data = {
'id': pkg_name,
'state': 'active',
}
tk.get_action("package_patch")(context, patch_package_data)

for f in uploaded_files:

data_dict = {
Expand Down

0 comments on commit 7ce75f1

Please sign in to comment.