Merge branch '1723-wrong-fields-in-member-edit'

ckan · Jul 23, 2014 · cd051d9 · cd051d9
2 parents 922af51 + a31444a
commit cd051d9
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 38 deletions.
diff --git a/ckan/templates/group/member_new.html b/ckan/templates/group/member_new.html
@@ -13,12 +13,14 @@ <h1 class="page-heading">
   <form class="dataset-form form-horizontal add-member-form" method='post'>
     <div class="row-fluid">
       <div class="control-group control-medium">
-        <label class="control-label" for="username">
-          {{ _('Existing User') }}
-        </label>
-        <span>
-          {{ _('If you wish to add an existing user, search for their username below.') }}
-        </span>
+        {% if not user %}
+          <label class="control-label" for="username">
+            {{ _('Existing User') }}
+          </label>
+          <span>
+            {{ _('If you wish to add an existing user, search for their username below.') }}
+          </span>
+        {% endif %}
         <div class="controls">
           {% if user %}
             <input type="hidden" name="username" value="{{ user.name }}" />
@@ -31,21 +33,24 @@ <h1 class="page-heading">
           {% endif %}
         </div>
       </div>
-      <div class="add-member-or">
-        {{ _('or') }}
-      </div>
-      <div class="control-group control-medium">
-        <label class="control-label" for="email">
-          {{ _('New User') }}
-        </label>
-        <span>
-          {{ _('If you wish to invite a new user, enter their email address.') }}
-        </span>
-        <div class="controls">
-          <input id="email" type="text" name="email" placeholder="Email address">
+      {% if not user %}
+        <div class="add-member-or">
+          {{ _('or') }}
         </div>
-      </div>
+        <div class="control-group control-medium">
+          <label class="control-label" for="email">
+            {{ _('New User') }}
+          </label>
+          <span>
+            {{ _('If you wish to invite a new user, enter their email address.') }}
+          </span>
+          <div class="controls">
+            <input id="email" type="text" name="email" placeholder="Email address">
+          </div>
+        </div>
+      {% endif %}
     </div>
+
     {% set format_attrs = {'data-module': 'autocomplete'} %}
     {{ form.select('role', label=_('Role'), options=c.roles, selected=c.user_role, error='', attrs=format_attrs) }}
     <div class="form-actions">

diff --git a/ckan/templates/organization/member_new.html b/ckan/templates/organization/member_new.html
@@ -15,12 +15,14 @@ <h1 class="page-heading">
   <form class="dataset-form form-horizontal add-member-form" method='post'>
     <div class="row-fluid">
       <div class="control-group control-medium">
-        <label class="control-label" for="username">
-          {{ _('Existing User') }}
-        </label>
-        <span>
-          {{ _('If you wish to add an existing user, search for their username below.') }}
-        </span>
+        {% if not user %}
+          <label class="control-label" for="username">
+            {{ _('Existing User') }}
+          </label>
+          <span>
+            {{ _('If you wish to add an existing user, search for their username below.') }}
+          </span>
+        {% endif %}
         <div class="controls">
           {% if user %}
             <input type="hidden" name="username" value="{{ user.name }}" />
@@ -33,20 +35,22 @@ <h1 class="page-heading">
           {% endif %}
         </div>
       </div>
-      <div class="add-member-or">
-        {{ _('or') }}
-      </div>
-      <div class="control-group control-medium">
-        <label class="control-label" for="email">
-          {{ _('New User') }}
-        </label>
-        <span>
-          {{ _('If you wish to invite a new user, enter their email address.') }}
-        </span>
-        <div class="controls">
-          <input id="email" type="text" name="email" placeholder="Email address">
+      {% if not user %}
+        <div class="add-member-or">
+          {{ _('or') }}
         </div>
-      </div>
+        <div class="control-group control-medium">
+          <label class="control-label" for="email">
+            {{ _('New User') }}
+          </label>
+          <span>
+            {{ _('If you wish to invite a new user, enter their email address.') }}
+          </span>
+          <div class="controls">
+            <input id="email" type="text" name="email" placeholder="Email address">
+          </div>
+        </div>
+      {% endif %}
     </div>
     {% set format_attrs = {'data-module': 'autocomplete'} %}
     {{ form.select('role', label=_('Role'), options=c.roles, selected=c.user_role, error='', attrs=format_attrs) }}