Errors in last PR #44

Signed-off-by: Vijay Sarvepalli (SEI) <[email protected]>
CERTCC · Aug 16, 2022 · 02abb87 · 02abb87
1 parent 5a7284d
commit 02abb87
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/cogauth/templates/cogauth/profile.html b/cogauth/templates/cogauth/profile.html
@@ -1,4 +1,4 @@
-{% extends 'vinny/base.html' %}
+{% extends VINCECOMM_BASE_TEMPLATE %}
 {% load i18n static %}
 {% block js %}
 {{ block.super }}
@@ -123,11 +123,7 @@ <h3>{{ coguser.preferred_username }}</h3>
       <tr>
 	<td>API Key</td>
 	<td>
-<<<<<<< HEAD
-	  <button id="gentoken" action="{% url 'cogauth:gentoken' %}" {% if coguser.api_key %} preaction="{% url 'cogauth:deltoken' %}" class="button default getaction" data-confirm="Would you like to create a new API key and revoke your old API key?">Refresh API Key{% else %}>Generate API Key{% endif %}</button>
-=======
 	  <button id="gentoken" class="button default getaction" action="{% url 'cogauth:gentoken' %}" {% if coguser.api_key %} preaction="{% url 'cogauth:deltoken' %}" data-confirm="Would you like to create a new API key and revoke your old API key?">Refresh API Key{% else %}>Generate API Key{% endif %}</button>
->>>>>>> 8a48f75ae87 (Fix API generate as a synchronous Delete and Create for)
 	</td>
       </tr>
     </table>

diff --git a/cogauth/views.py b/cogauth/views.py
@@ -992,7 +992,7 @@ def form_valid(self, form):
                 return redirect('cogauth:password_change')
             else:
                 form._errors.setdefault("username", ErrorList([
-                    u"Error Occurred. Please contact [email protected]"
+                    u"Error Occurred. Please contact System Administrator."
                 ]))
                 return super().form_invalid(form)