Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ckanext-odsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Open-Data
ckanext-odsh
Commits
2036d01e
Commit
2036d01e
authored
Nov 2, 2018
by
anonymous
Browse files
Options
Downloads
Patches
Plain Diff
always select default organisation for new packages
parent
f3f45445
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
ckanext/odsh/templates/package/snippets/package_basic_fields.html
+4
-36
4 additions, 36 deletions
...odsh/templates/package/snippets/package_basic_fields.html
with
4 additions
and
36 deletions
ckanext/odsh/templates/package/snippets/package_basic_fields.html
+
4
−
36
View file @
2036d01e
...
...
@@ -103,41 +103,11 @@ is_required=true,placeholder=_('Enter title')) }}
classes=['control-full'], attrs=tag_attrs,
is_required=true, placeholder=_('odsh tags placeholder')) }}
{% endblock %}
{% block package_basic_fields_org %}
{# if we have a default group then this wants remembering #}
{% if data.group_id %}
<input
type=
"hidden"
name=
"groups__0__id"
value=
"{{ data.group_id }}"
/>
{% endif %}
{% set dataset_is_draft = data.get('state', 'draft').startswith('draft') or data.get('state', 'none') == 'none'
%}
{% set dataset_has_organization = data.owner_org or data.group_id %}
{% set organizations_available = h.organizations_available('create_dataset') %}
{% set user_is_sysadmin = h.check_access('sysadmin') %}
{% set show_organizations_selector = organizations_available %}
{% set show_visibility_selector = dataset_has_organization or (organizations_available and (user_is_sysadmin or
dataset_is_draft)) %}
{% block package_basic_fields_org %}
{% set existing_org = data.owner_org or data.group_id %}
<div
class=
"control-group"
>
<label
for=
"field-organizations"
class=
"control-label"
>
{{ _('Organization') }}
</label>
<div
class=
"controls"
>
<select
id=
"field-organizations"
name=
"owner_org"
data-module=
"autocomplete"
>
{% if h.check_config_permission('create_unowned_dataset') %}
<option
value=
""
{%
if
not
selected_org
and
data.id
%}
selected=
"selected"
{%
endif
%}
>
{{ _('No
organization') }}
</option>
{% endif %}
{% for organization in organizations_available %}
{# get out first org from users list only if there is not an existing org #}
{% set selected_org = (existing_org and existing_org == organization.id) or (not existing_org and
not
data.id and organization.id == organizations_available[0].id) %}
<option
value=
"{{ organization.id }}"
{%
if
selected_org
%}
selected=
"selected"
{%
endif
%}
>
{{
organization.display_name }}
</option>
{% endfor %}
</select>
</div>
</div>
<input
id=
"field-organizations"
name=
"owner_org"
type=
"hidden"
value=
"{{ existing_org }}"
/>
{% endblock %}
<!-- field spatial_extension -->
{{ form.input('spatial_extension', id='field-spatial-extension', label=_('Spatial extension'),
...
...
@@ -173,5 +143,3 @@ is_required=true,placeholder=_('Enter title')) }}
</div>
</div>
{% endif %}
\ No newline at end of file
{% endblock %}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment