Make the group cn an editable field though protected by default.

Fix some issues with the multi-value to single-value reversion.

1 files changed, 9 insertions, 2 deletions

diff --git a/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid b/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid
index e6e45678..d46bc731 100644
--- a/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid
@@ -33,11 +33,14 @@ from ipagui.helpers import ipahelper
   <script type="text/javascript">
     function toggleProtectedFields(checkbox) {
       var gidnumberField = $('form_gidnumber');
+      var cnField = $('form_cn');
       if (checkbox.checked) {
         gidnumberField.disabled = false;
+        cnField.disabled = false;
         $('form_editprotected').value = 'true';
       } else {
         gidnumberField.disabled = true;
+        cnField.disabled = true;
         $('form_editprotected').value = '';
       }
     }
@@ -73,8 +76,8 @@ from ipagui.helpers import ipahelper
         </th>
         <td>
           <span py:replace="group_fields.cn.display(value_for(group_fields.cn))" />
-          <span py:if="tg.errors.get('description')" class="fielderror"
-              py:content="tg.errors.get('description')" />
+          <span py:if="tg.errors.get('cn')" class="fielderror"
+              py:content="tg.errors.get('cn')" />
         </td>
       </tr>
 
@@ -88,6 +91,9 @@ from ipagui.helpers import ipahelper
           <span py:if="tg.errors.get('description')" class="fielderror"
               py:content="tg.errors.get('description')" />
 
+          <script type="text/javascript">
+              document.getElementById('form_cn').disabled = true;
+          </script>
         </td>
       </tr>
 
@@ -160,6 +166,7 @@ from ipagui.helpers import ipahelper
           div_counter = div_counter + 1
           ?>
         </div>
+        &nbsp; <!-- a space here to prevent an empty div -->
       </div>
 
     </div>