Acquire URL can also be hidden when the user is editing a dataset
This commit is contained in:
parent
ae598af192
commit
adde7d2fa2
|
@ -64,3 +64,7 @@ def get_config_bool_value(config_name, default_value=False):
|
|||
|
||||
def show_acquire_url_on_create():
|
||||
return get_config_bool_value('ckan.privatedatasets.show_acquire_url_on_create')
|
||||
|
||||
|
||||
def show_acquire_url_on_edit():
|
||||
return get_config_bool_value('ckan.privatedatasets.show_acquire_url_on_edit')
|
||||
|
|
|
@ -247,4 +247,5 @@ class PrivateDatasets(p.SingletonPlugin, tk.DefaultDatasetForm):
|
|||
'is_owner': helpers.is_owner,
|
||||
'can_read': helpers.can_read,
|
||||
'show_acquire_url_on_create': helpers.show_acquire_url_on_create,
|
||||
'show_acquire_url_on_edit': helpers.show_acquire_url_on_edit
|
||||
}
|
||||
|
|
|
@ -86,8 +86,10 @@
|
|||
{{ form.input('allowed_users_str', label=_('Allowed Users'), id='field-allowed_users_str', placeholder=_('Allowed Users'), value=h.get_allowed_users_str(data.allowed_users), error=errors.custom_text, classes=['control-full'], attrs=users_attrs) }}
|
||||
|
||||
|
||||
{% if editing or not editing and h.show_acquire_url_on_create() %}
|
||||
{% if editing and h.show_acquire_url_on_edit() or not editing and h.show_acquire_url_on_create() %}
|
||||
{{ form.input('acquire_url', label=_('Acquire URL'), id='field-acquire_url', placeholder=_('http://example.com/acquire/'), value=data.acquire_url, error=errors.custom_text, classes=['control-medium']) }}
|
||||
{% else %}
|
||||
<input type="hidden" name="acquire_url" id="acquire_url" value="{{ data.acquire_url }}" />
|
||||
{% endif %}
|
||||
|
||||
{% if data.id and h.check_access('package_delete', {'id': data.id}) and data.state != 'active' %}
|
||||
|
|
|
@ -135,3 +135,15 @@ class HelpersTest(unittest.TestCase):
|
|||
|
||||
# Call the function
|
||||
self.assertEquals(expected_value, helpers.show_acquire_url_on_create())
|
||||
|
||||
@parameterized.expand([
|
||||
(None, False),
|
||||
('True', True),
|
||||
('False', False)
|
||||
])
|
||||
def test_show_acquire_url_on_edit(self, config_value, expected_value):
|
||||
if config_value is not None:
|
||||
helpers.config['ckan.privatedatasets.show_acquire_url_on_edit'] = config_value
|
||||
|
||||
# Call the function
|
||||
self.assertEquals(expected_value, helpers.show_acquire_url_on_edit())
|
||||
|
|
3
test.ini
3
test.ini
|
@ -9,4 +9,5 @@ use = config:./ckan/test-core.ini
|
|||
ckan.legacy_templates = No
|
||||
ckan.plugins = privatedatasets
|
||||
ckan.privatedatasets.parser = ckanext.privatedatasets.parsers.fiware:FiWareNotificationParser
|
||||
ckan.privatedatasets.show_acquire_url_on_create = True
|
||||
ckan.privatedatasets.show_acquire_url_on_create = True
|
||||
ckan.privatedatasets.show_acquire_url_on_edit = True
|
Loading…
Reference in New Issue