Formatting changes, test TurboMail properly, fix PgToLDAP.py

fas/dev.cfg

@@ -7,8 +7,9 @@
 #mail.server = 'bastion.fedora.phx.redhat.com'
 #base_url_filter.base_url = "http://192.168.2.101:8080"
 
-mail.on = False
+mail.on = True
 mail.server = 'bastion.fedora.phx.redhat.com'
+mail.testmode = True
 mail.debug = False
 mail.encoding = 'utf-8'
 

fas/fas/templates/group/view.html

@@ -65,8 +65,9 @@
         <?python
         from datetime import datetime
         ?>
-        <td>${datetime.utcfromtimestamp(groups[user].fedoraRoleCreationDate).ctime()}</td>
-        <td>${groups[user].fedoraRoleApprovalDate}</td>
+        <td>${datetime.utcfromtimestamp(float(groups[user].fedoraRoleCreationDate)).ctime()}</td>
+        <td py:if="groups[user].fedoraRoleApprovalDate.lower() == 'none'">None</td>
+        <td py:if="groups[user].fedoraRoleApprovalDate.lower() != 'none'">${datetime.utcfromtimestamp(float(groups[user].fedoraRoleApprovalDate)).ctime()}</td>
         <td>${groups[user].fedoraRoleStatus}</td>
         <td>${groups[user].fedoraRoleType}</td>
         <!--<td>${groups[user].fedoraRoleDomain}</td>-->

fas/fas/templates/user/view.html

@@ -40,8 +40,8 @@
     </ul>
     -->
     <ul id="rolespanel" py:if="personal">
-      <li py:for="group in sorted(groups.keys())" class="role">
-      <div py:if="auth.canViewGroup(user.cn, group)" py:strip="">
+      <div py:for="group in sorted(groups.keys())" py:strip="">
+      <li py:if="auth.canViewGroup(user.cn, group)" class="role">
       <h4>${groupdata[group].fedoraGroupDesc}</h4> (${groups[group].fedoraRoleType})
       <dl>
         <dt>Status:</dt>
@@ -71,8 +71,8 @@
           </dd>
         </div>
       </dl>
-      </div>
       </li>
+      </div>
     </ul>
   </body>
 </html>

fas/ldap/PgToLDAP.py

@@ -320,8 +320,8 @@ def main():
                 print prereq
             else:
                 prereq=["None"]
-	    print owner
 
+        print owner
 
             #id0, name1, owner_id2, group_type3, needs_sponsor4, user_can_remove5, prerequisite_id6, joinmsg7
         userLdif = [["objectClass",["fedoraGroup"]] ]