Commits

Zhang Huangbin committed fe8d7ae

Don't show created time stamp.

Comments (0)

Files changed (6)

libs/dbmail_mysql/admin.py

         try:
             result = self.conn.query(
                 """
-                SELECT name, username, language, created, active
+                SELECT name, username, language, active
                 FROM dbmail_admins
                 ORDER BY username ASC
                 %s

libs/dbmail_mysql/connUtils.py

                 qr_admin = self.conn.select(
                     'dbmail_admins',
                     vars=sql_vars,
-                    what='username,name,active,created',
+                    what='username,name,active',
                     where='(username LIKE $search_str OR name LIKE $search_str) %s' % (sql_append_status),
                     order='username',
                 )
 
             result['allGlobalAdmins'] = allGlobalAdmins
 
+        if len(qr_domain) > 0:
+            result['domain'] = iredutils.convertSQLQueryRecords(qr_domain) or []
+
         if len(qr_user) > 0:
             result['user'] = iredutils.convertSQLQueryRecords(qr_user) or []
 

libs/dbmail_mysql/domain.py

                 '''
                 SELECT
                     dbmail_admins.username, dbmail_admins.name, dbmail_admins.language,
-                    dbmail_admins.created, dbmail_admins.active
+                    dbmail_admins.active
                 FROM dbmail_admins
                 LEFT JOIN dbmail_domain_admins ON (dbmail_domain_admins.username=dbmail_admins.username)
                 WHERE dbmail_domain_admins.domain=$domain
                 GROUP BY
                     dbmail_domains.domain, dbmail_domains.description, dbmail_domains.aliases,
                     dbmail_domains.mailboxes, dbmail_domains.maxquota, dbmail_domains.quota,
-                    dbmail_domains.transport, dbmail_domains.backupmx, dbmail_domains.created,
-                    dbmail_domains.active
+                    dbmail_domains.transport, dbmail_domains.backupmx, dbmail_domains.active
                 ORDER BY dbmail_domains.domain
                 LIMIT 1
                 ''',

templates/default/dbmail_mysql/admin/list.html

             <th>{{ _('Display Name') }}</th>
             <th>{{ _('Mail Address') }}</th>
             <th>{{ _('Global Admin') }}</th>
-            <th>{{ _('Created') }}</th>
         </tr>
         </thead>
 
                     {% else %}
                         <td>{{ set_admin_type_img('no') }}</td>
                     {% endif %}
-                    <td>{{ r.created |setDatetimeFormat(hour=False) }}</td>
                 </tr>
             {% endfor %}
         </tbody>

templates/default/dbmail_mysql/alias/list.html

             <th class="checkbox"><input type="checkbox" class="checkbox select-all" /></th>
             <th>{{ _('Display Name') }}</th>
             <th>{{ _('Mail Address') }}</th>
-            {#
-            <th>{{ _('Created') }}</th>
-            #}
         </tr>
         </thead>
 
                     {% if name %}{{ name |cutString |e }}{% else %}{{ address.split('@', 1)[0] }}{% endif %}
                 </td>
                 <td>{{ highlight_username_in_mail(address) }}</td>
-                {#
-                <td>{{ r.created |setDatetimeFormat(hour=False) }}</td>
-                #}
             </tr>
         {% endfor %}
     {% else %}

templates/default/dbmail_mysql/search.html

                                 <th>{{ _('Display Name') }}</th>
                                 <th>{{ _('Mail Address') }}</th>
                                 <th>{{ _('Global Admin') }}</th>
-                                <th>{{ _('Created') }}</th>
                             </tr>
                         </thead>
 
                                     {% else %}
                                         <td>{{ set_admin_type_img('no') }}</td>
                                     {% endif %}
-                                    <td>{{ r.created |setDatetimeFormat(hour=False) }}</td>
                                 </tr>
                             {% endfor %}
                         </tbody>
                                 <th>{{ _('Mail Address') }}</th>
                                 <th>{{ _('User ID') }}</th>
                                 <th>{{ _('Quota') }}</th>
-                                <th>{{ _('Created') }}</th>
                             </tr>
                         </thead>
 
                                             {{ display_progress_bar(percent, show_zero=true, width='60%', style='thin') }}
                                         </td>
                                     {% endif %}
-                                    <td class="vcenter">{{ r.created |setDatetimeFormat(hour=False) }}</td>
                                 </tr>
                             {% endfor %}
                         </tbody>
                                 <th class="checkbox"><input type="checkbox" class="checkbox select-all" /></th>
                                 <th>{{ _('Display Name') }}</th>
                                 <th>{{ _('Mail Address') }}</th>
-                                <th>{{ _('Created') }}</th>
                             </tr>
                         </thead>
 
                                         {% if name %}{{ name |cutString |e }}{% else %}{{ address.split('@', 1)[0] }}{% endif %}
                                     </td>
                                     <td>{{ highlight_username_in_mail(address) }}</td>
-                                    <td>{{ r.created |setDatetimeFormat(hour=False) }}</td>
                                 </tr>
                             {% endfor %}
                         </tbody>