Skip to content

Commit

Permalink
AV-461: Remove inviting users by email address
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zharktas
Zharktas committed Jan 10, 2019
1 parent 7fa457f commit d0ccc1c
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 49 deletions.
46 changes: 46 additions & 0 deletions modules/ckanext-ytp_main/ckanext/ytp/templates/group/member_new.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{% ckan_extends %}

{% block form %}
<form class="dataset-form add-member-form" method='post' id="add-member-form">
<div class="row">
<div class="col-md-5">
<div class="form-group control-medium">
{% if not user %}
<label class="control-label" for="username">
{{ _('Existing User') }}
</label>
<p>
{{ _('If you wish to add an existing user, search for their username below.') }}
</p>
{% endif %}
<div class="controls">
{% if user %}
<input type="hidden" name="username" value="{{ user.name }}" />
<input id="username" name="username" type="text" value="{{ user.name }}"
disabled="True" class="form-control control-medium">
{% else %}
<input id="username" type="text" name="username" placeholder="Username"
value="" class="control-medium" data-module="autocomplete"
data-module-source="/api/2/util/user/autocomplete?q=?">
{% endif %}
</div>
</div>
</div>
</div>

{% set format_attrs = {'data-module': 'autocomplete'} %}
{{ form.select('role', label=_('Role'), options=roles, selected=user_role, error='', attrs=format_attrs) }}
<div class="form-actions">
{% if user %}
<a href="{{ h.url_for(group_type + '.member_delete', id=group_dict.id, user=user_id) }}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}">{{ _('Delete') }}</a>
<button class="btn btn-primary" type="submit" name="submit" >
{{ _('Save') }}
</button>
{% else %}
<button class="btn btn-primary" type="submit" name="submit" >
{{ _('Add Member') }}
</button>
{% endif %}
</div>
</form>
{% endblock %}
84 changes: 35 additions & 49 deletions modules/ckanext-ytp_main/ckanext/ytp/templates/organization/member_new.html
View file
Original file line number Diff line number Diff line change
@@ -1,62 +1,48 @@
{% ckan_extends %}
{% block form %}
<form class="dataset-form form-horizontal add-member-form" method='post'>
<div class="row-fluid">
<div class="control-group control-medium">
<span>
{{ _('If you wish to add an existing user, search for their username below.') }}
</span>
<br />
{% block form %}
<form class="dataset-form add-member-form" method='post'>
<div class="row">
<div class="col-md-5">
<div class="form-group control-medium">
{% if not user %}
<label class="control-label" for="username">
{{ _('Existing User') }}
</label>
<p>
{{ _('If you wish to add an existing user, search for their username below.') }}
</p>
{% endif %}
<div class="controls">
{% if user %}
<input type="hidden" name="username" value="{{ user.name }}" />
<input id="username" name="username" type="text" value="{{ user.name }}"
disabled="True" class="control-medium">
<input type="hidden" name="username" value="{{ user.name }}" />
<input id="username" name="username" type="text" value="{{ user.name }}"
disabled="True" class="form-control">
{% else %}
<input id="username" type="text" name="username" placeholder="Username"
value="" class="control-medium" data-module="autocomplete"
data-module-source="/api/2/util/user/autocomplete?q=?">
<input id="username" type="text" name="username" placeholder="{{ _('Username') }}"
value="" class="control-medium" data-module="autocomplete"
data-module-source="/api/2/util/user/autocomplete?q=?">
{% endif %}
</div>
</div>
<div class="add-member-or">
<span class="add-member-or">
{{- _('or') -}}</span>
</div>
<div class="control-group control-medium">
<span>
{{ _('If you wish to invite a new user, enter their email address.') }}
</span><br />
<label class="control-label" for="email">
{{ _('New User') }}
</label>

<div class="controls">
<input id="email" type="text" name="email" placeholder="Email address">
</div>
</div>
</div>
<div class="control-group control-medium">
{% set format_attrs = {'data-module': 'autocomplete', 'data-module-interval': '50'} %}
{{ form.select('role', label=_('Role'), options=c.roles, selected=c.user_role, error='', attrs=format_attrs) }}
</div>
<div class="form-actions">
{% if user %}
{% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %}
<a href="{% url_for controller='organization', action='member_delete', id=c.group_dict.id, user=user.id %}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-i18n="{{ locale }}">{{ _('Delete') }}</a>
<button class="btn btn-primary" type="submit" name="submit" >
{{ _('Update Member') }}
</button>
{% else %}
<button class="btn btn-primary" type="submit" name="submit" >
{{ _('Add Member') }}
</button>
{% endif %}
</div>
</form>
{% endblock %}

</div>

{% set format_attrs = {'data-module': 'autocomplete'} %}
{{ form.select('role', label=_('Role'), options=roles, selected=user_role, error='', attrs=format_attrs) }}
<div class="form-actions">
{% if user %}
<a href="{{ h.url_for(group_type + '.member_delete', id=group_dict.id, user=user_id) }}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}">{{ _('Delete') }}</a>
<button class="btn btn-primary" type="submit" name="submit" >
{{ _('Update Member') }}
</button>
{% else %}
<button class="btn btn-primary" type="submit" name="submit" >
{{ _('Add Member') }}
</button>
{% endif %}
</div>
</form>
{% endblock %}


0 comments on commit d0ccc1c

Please sign in to comment.