Fix: merge conflict def def account_process(): in views.py

[unfold.git] / portal / templates / my_account.html

diff --git a/portal/templates/my_account.html b/portal/templates/my_account.html
index 68ac245..75cb11f 100644 (file)
--- a/portal/templates/my_account.html
+++ b/portal/templates/my_account.html
@@ -40,7 +40,7 @@
   <div class='ms-dashboard-content' id='tophat__list__user_hrn'>
     <div id="main">
       <div id="middle" align="center">
-       <form id="editForm"  method="POST" action="acc_process" enctype="multipart/form-data">
+       <form id="editForm"  method="POST" action="account_process" enctype="multipart/form-data">
          {% csrf_token %}
          <table class="profile">          
            <tr class="odd">
@@ -99,9 +99,9 @@
 
              </tr>
              <tr class="odd">
-               <td class="key">Affiliation</td>
+               <td class="key">Authority</td>
                <td class="value">
-                 <span id="affval" class="value">{{ affiliation }}</span>
+                 <span id="affval" class="value">{{ authority }}</span>
                  <img class="logo" src="{{STATIC_URL}}/img/ques_icon.png" onclick="affAlert()"  title="To change your affiliation please contact the administrator" style="height: 20px; width: 20px; position: absolute; left: 625px; left: 900px; ">
                  </td>
                </tr>