[sagenb] 37/179: Merge branch 'master' into ldap

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository sagenb.

commit 9507fa1ba8789c56d8836593c6d9ee70108b9fb6
Merge: ea395bc 0ae273b
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Fri Nov 2 19:07:36 2012 +0100

    Merge branch 'master' into ldap
    
    Conflicts:
    	sagenb/data/sage/html/settings/user_management.html
    	sagenb/notebook/user.py

 flask_version/admin.py                             | 60 ++++++++++++++++------
 flask_version/decorators.py                        |  4 +-
 .../data/sage/html/settings/user_management.html   | 21 +++++---
 sagenb/notebook/user.py                            | 14 +++--
 4 files changed, 71 insertions(+), 28 deletions(-)

diff --cc sagenb/data/sage/html/settings/user_management.html
index 9ef0a30,bf9ca6f..1255304
--- a/sagenb/data/sage/html/settings/user_management.html
+++ b/sagenb/data/sage/html/settings/user_management.html
@@@ -11,16 -11,20 +11,25 @@@
      {% endif %}
      <table>
        <tr>
-         <th>{{ gettext('Users') }}</th>
+         <th>{{ gettext('User') }}</th>
          <th>{{ gettext('Password') }}</th>
          <th>{{ gettext('Suspension') }}</th>
+         <th>{{ gettext('Admin') }}</th>
+         <th>{{ gettext('Delete') }}</th>
        </tr>
-       {% for user in users %}
-       {% if user != 'admin' %}
+       {% for u in users %}
+       {% if u.username() != 'admin' %}
        <tr>
-         <td><a href="/home/{{ user }}/">{{ user }}</a></td>
-         <td>{% if not user.is_external() %}<a href="/users/?reset={{ user }}">{{ gettext('Reset') }}</a>{% endif %}</td>
-         <td><a href="/users/?suspension={{ user }}">{% if user.is_suspended() %}{{ gettext('Unsuspend') }}{% else %}{{ gettext('Suspend') }}{% endif %}</td>
 -      <td><a href="/home/{{ u }}/">{{ u }}</a></td>
 -      <td><a href="{{ url_for('users', reset=u.username()) }}">{{ gettext('Reset') }}</a></td>
 -      <td><a href="{{ url_for('suspend_user', user=u.username()) }}">{% if u.is_suspended() %}{{ gettext('Unsuspend') }}{% else %}{{ gettext('Suspend') }}{% endif %}</a></td>
 -      <td><a href="{{ url_for('toggle_admin', user=u.username()) }}">{% if u.is_admin() %}{{ gettext('Revoke') }}{% else %}{{ gettext('Grant') }}{% endif %}</a> </td>
 -      <td><a href="{{ url_for('del_user', user=u.username()) }} ">{{ gettext('Delete') }}</a></td>
++         <td><a href="/home/{{ u }}/">{{ u }}</a></td>
++         <td>{% if not user.is_external() %}<a href="/users/?reset={{ user }}">{{ gettext('Reset') }}</a>{% endif %}</td>
++         <td>
++            {% if not u.is_external() %}
++            <a href="{{ url_for('users', reset=u.username()) }}">{{ gettext('Reset') }}</a>
++            {% endif %}
++         </td>
++         <td><a href="{{ url_for('suspend_user', user=u.username()) }}">{% if u.is_suspended() %}{{ gettext('Unsuspend') }}{% else %}{{ gettext('Suspend') }}{% endif %}</a></td>
++         <td><a href="{{ url_for('toggle_admin', user=u.username()) }}">{% if u.is_admin() %}{{ gettext('Revoke') }}{% else %}{{ gettext('Grant') }}{% endif %}</a> </td>
++         <td><a href="{{ url_for('del_user', user=u.username()) }} ">{{ gettext('Delete') }}</a></td>
        </tr>
        {% endif %}
        {% endfor %}
diff --cc sagenb/notebook/user.py
index 6cc2fb9,ac8b757..0ef5081
--- a/sagenb/notebook/user.py
+++ b/sagenb/notebook/user.py
@@@ -289,13 -296,7 +297,13 @@@ class User(object)
              sage: User('B', account_type='user').is_guest()
              False
          """
-         return self._account_type == 'guest'
+         return self.account_type() == 'guest'
 +
 +    def is_external(self):
-         return self._external_auth is not None
++        return self.external_auth() is not None
 +
 +    def external_auth(self):
 +        return self._external_auth
          
      def is_suspended(self):
          """

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git