Merged community tracking branch from esanchez@yaco.es, r3175-3679,3713-3830.

[[Split portion of a mixed commit.]]
 - Legacy-Id: 4518.2

Author: levkowetz

ietf/ietfauth/forms.py

@@ -11,7 +11,7 @@
 
 from ietf.utils.mail import send_mail
 from ietf.utils import debug
-#from ietf.person.models import Person, Email
+from ietf.person.models import Person, Email
 
 
 class RegistrationForm(forms.Form):
@@ -96,34 +96,64 @@ def get_password(self):
         return self.cleaned_data.get('password1')
 
     def create_user(self):
-#         user = User.objects.create(username=self.username,
-#                                    email=self.username)
-#         person = Person.objects.create(user=user,
-#                                        name=self.username,
-#                                        ascii=self.username)
-#         Email.objects.create(person=person,
-#                              address=self.username)
-#         return user
-        return None
+        user = User.objects.create(username=self.username,
+                                   email=self.username)
+        email = Email.objects.filter(address=self.username)
+        person = None
+        if email.count():
+            email = email[0]
+            if email.person:
+                person = email.person
+        else:
+            email = None
+        if not person:
+            person = Person.objects.create(user=user,
+                                           name=self.username,
+                                           ascii=self.username)
+        if not email:
+            email = Email.objects.create(address=self.username,
+                                         person=person)
+        email.person = person
+        email.save()
+        person.user = user
+        person.save()
+        return user
 
     def get_user(self):
         return User.objects.get(username=self.username)
 
-    @debug.trace
+    def save_password_file(self):
+        if getattr(settings, 'USE_PYTHON_HTDIGEST', None):
+            pass_file = settings.HTPASSWD_FILE
+            realm = settings.HTDIGEST_REALM
+            password = self.get_password()
+            username = self.username
+            prefix = '%s:%s:' % (username, realm)
+            key = hashlib.md5(prefix + password).hexdigest()
+            f = open(pass_file, 'r+')
+            pos = f.tell()
+            line = f.readline()
+            while line:
+                if line.startswith(prefix):
+                    break
+                pos=f.tell()
+                line = f.readline()
+            f.seek(pos)
+            f.write('%s%s\n' % (prefix, key))
+            f.close()
+        else:
+            p = subprocess.Popen([settings.HTPASSWD_COMMAND, "-b", settings.HTPASSWD_FILE, self.username, self.get_password()], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            stdout, stderr = p.communicate()
+
     def save(self):
-#         if self.update_user:
-#             user = self.get_user()
-#         else:
-#             user = self.create_user()
-#         user.set_password(self.get_password())
-#         user.save()
-#         return user
-        debug.show("[settings.HTPASSWD_COMMAND, settings.HTPASSWD_FILE, self.username, self.get_password()]")
-        p = subprocess.Popen([settings.HTPASSWD_COMMAND, "-b", settings.HTPASSWD_FILE, self.username, self.get_password()], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        stdout, stderr = p.communicate()
-        debug.show('stdout')
-        debug.show('stderr')        
-        return p.returncode
+        if self.update_user:
+            user = self.get_user()
+        else:
+            user = self.create_user()
+        user.set_password(self.get_password())
+        user.save()
+        self.save_password_file()
+        return user
 
 class TestEmailForm(forms.Form):
     email = forms.EmailField(required=False)

ietf/ietfauth/views.py

@@ -35,20 +35,25 @@
 import datetime
 import hashlib
 
+from django.conf import settings
 from django.template import RequestContext
 from django.http import HttpResponse, Http404, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render_to_response
-from django.contrib.auth.decorators import login_required
 from django.contrib.auth import REDIRECT_FIELD_NAME, authenticate, login
+from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
-from django.conf import settings
+from django.http import HttpResponseRedirect, HttpResponse, Http404
+from django.shortcuts import render_to_response
+from django.template import RequestContext
+from django.utils import simplejson
 from django.utils.http import urlquote
-
 from django.contrib.auth.models import User
 from django.utils import simplejson as json
 from django.utils.translation import ugettext as _
 
-from forms import *
+#from forms import *
+from ietf.ietfauth.forms import (RegistrationForm, PasswordForm,
+                                 RecoverPasswordForm)
 
 
 def index(request):
@@ -61,7 +66,8 @@ def url_login(request, user, passwd):
         if user.is_active:
             login(request, user)
             return HttpResponseRedirect('/accounts/loggedin/?%s=%s' % (REDIRECT_FIELD_NAME, urlquote(redirect_to)))
-    return HttpResponse("Not authenticated?", status=500)        
+    return HttpResponse("Not authenticated?", status=500)
+
 
 def ietf_login(request):
     if not request.user.is_authenticated():
@@ -71,6 +77,7 @@ def ietf_login(request):
     request.session.set_test_cookie()
     return HttpResponseRedirect('/accounts/loggedin/?%s=%s' % (REDIRECT_FIELD_NAME, urlquote(redirect_to)))
 
+
 def ietf_loggedin(request):
     if not request.session.test_cookie_worked():
         return HttpResponse("You need to enable cookies")
@@ -79,28 +86,28 @@ def ietf_loggedin(request):
     if not redirect_to or '//' in redirect_to or ' ' in redirect_to:
         redirect_to = settings.LOGIN_REDIRECT_URL
     return HttpResponseRedirect(redirect_to)
-    
+
+
 @login_required
 def profile(request):
     if settings.USE_DB_REDESIGN_PROXY_CLASSES:
         from ietf.person.models import Person
         from ietf.group.models import Role
-        
+
         roles = []
         person = None
         try:
             person = request.user.get_profile()
             roles = Role.objects.filter(person=person)
         except Person.DoesNotExist:
             pass
-        
+
         return render_to_response('registration/profileREDESIGN.html',
                                   dict(roles=roles,
                                        person=person),
                                   context_instance=RequestContext(request))
-    
-    return render_to_response('registration/profile.html', context_instance=RequestContext(request))
 
+    return render_to_response('registration/profile.html', context_instance=RequestContext(request))
 
 def create_account(request):
     success = False
@@ -178,7 +185,7 @@ def ajax_check_username(request):
     username = request.GET.get('username', '')
     error = False
     if User.objects.filter(username=username).count():
-        error = _('This email is already in use')
+        error = _('This email address is already registered')
     return HttpResponse(json.dumps({'error': error}), mimetype='text/plain')
 
 def test_email(request):

ietf/settings.py

@@ -158,6 +158,7 @@
     'ietf.ietfworkflows',
     'ietf.wgchairs',
     'ietf.wgcharter',
+    'ietf.community',
 )
 
 INTERNAL_IPS = (

ietf/templates/base_leftmenu.html

@@ -33,7 +33,8 @@
 
 {% endcomment %}
 {% load wg_menu %} 
-{% load ietf_filters ietf_streams %}
+{% load ietf_filters ietf_streams community_tags %}
+{% load ietf_filters community_tags %}
 <ul>
 <li class="sect first">Accounts</li>
   <li><a href="{% url account_index %}">New Account</a></li>
@@ -76,6 +77,15 @@
   <li><a href="http://tools.ietf.org/wg/concluded">Concluded WGs</a></li>
   <li><a href="http://www.ietf.org/list/nonwg.html">Non-WG Lists</a></li>
 
+{% get_user_managed_lists user as community_lists %}
+{% if community_lists %}
+<li class="sect">Community ID lists</li>
+   <li><a href="{{ community_lists.personal.get_manage_url }}">{{ community_lists.personal.short_name }}</a>
+   {% for cl in community_lists.group %}
+   <li><a href="{{ cl.get_manage_url }}">{{ cl.short_name }}</a>
+   {% endfor %}
+{% endif %}
+
 <li class="sect">Drafts&nbsp;&amp;&nbsp;RFCs</li>
   <li><a href="/doc/">Search</a></li>
   <li><form action="/doc/search/" method="get" style="padding-bottom:0;margin-bottom:0;"><input type="text" style="margin-left:10px; width:100px; border:1px solid #89d;" name="name" /><input type="hidden" name="activeDrafts" value="on"/><input type="hidden" name="rfcs" value="on"/></form></li>

ietf/templates/community/customize_display.html

@@ -0,0 +1,18 @@
+<h2>Display customization</h2>
+
+<form action="#custom" method="POST" />
+  <h3>Sort method</h2>
+  {{ display_form.sort_method }}
+
+  <h3>Show fields</h2>
+  <div>
+  {% for field in dc.get_display_fields_config %}
+  <div style="float: left; width: 30%;">
+    <input id="id_{{ field.codename }}" type="checkbox" name="{{ field.codename }}"{% if field.active %} checked="checked"{% endif %} />
+    <label for="id_{{ field.codename }}">{{ field.description }}</label>
+  </div>
+  {% endfor %}
+  </div>
+  <div style="clear: both;"><br /></div>
+  <input type="submit" value="Save configuration" name="save_display" />
+</form>

ietf/templates/community/display_field.html

@@ -0,0 +1 @@
+<span class="displayField displayField-{{ field.codename }}">{{ value|safe }}</span>

ietf/templates/community/manage_clist.html

@@ -0,0 +1,125 @@
+{% extends "base.html" %}
+
+{% block pagehead %}
+{{ block.super }}
+<script type="text/javascript" src="/js/lib/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="/js/yui/yui-20100305.js"></script>
+<script type="text/javascript" src="/js/base.js"></script>
+<script type="text/javascript" src="/js/community.js"></script>
+{% endblock pagehead %}
+
+{% block title %}{{ cl.long_name }}{% endblock %}
+
+{% block content %}
+<h1>{{ cl.long_name }}</h1>
+<div id="mytabs" class="yui-navset">
+<ul class="yui-nav">
+  <li class="selected"><a href="#view"><em>Documents</em></a></li>
+  <li><a href="#documents"><em>Manually added</em></a></li>
+  <li><a href="#rules"><em>Rules</em></a></li>
+  <li><a href="#custom"><em>Display customization</em></a></li>
+  <li><a href="#info"><em>Exports</em></a></li>
+</ul>
+
+<div class="yui-content">
+
+<div id="view">
+{% include "community/view_list.html" %}
+</div>
+
+<div id="documents">
+<h2>Documents manually added to this list</h2>
+<p>
+In order to add some individual documents to your list you have to:
+</p>
+<ul>
+   <li>Search the document or documents you want to add using <a href="/doc/search">the datatracker searcher</a>.</li>
+   <li>In the search result you'll find a link to add individual documents to your list.</li>
+</ul>
+<table class="ietf-table">
+ <tr><th>Name</th><th>Title</th><th>Remove from list</th></tr>
+{% for doc in cl.added_ids.all %}
+<tr class="{% cycle oddrow,evenrow %}">
+  <td>{{ doc }}</td>
+  <td><a href="{{ doc.get_absolute_url }}"</a>{{ doc.title }}</td>
+  <td><a href="{% url community_remove_document cl.pk doc.pk %}">Remove</a></td>
+</tr>
+{% endfor %}
+</table>
+</div>
+
+<div id="rules">
+<h2>Rules added to this list</h2>
+<table class="ietf-table">
+ <tr><th>Rule</th><th>Value</th><th>Documents</th><th>Remove from list</th></tr>
+{% for rule in cl.rule_set.all %}
+{% with rule.get_callable_rule as callable %}
+<tr class="{% cycle oddrow,evenrow %}">
+  <td>{{ callable.description }}</td>
+  <td>{{ callable.show_value }}</td>
+  <td>{% with rule.cached_ids.count as count %}{{ count }} document{{ count|pluralize }}{% endwith %}</td>
+  <td><a href="{% url community_remove_rule cl.pk rule.pk %}">Remove</a></td>
+</tr>
+{% endwith %}
+{% endfor %}
+</table>
+
+<h3>Add a new rule</h3>
+<form method="post" action="#rules">
+{{ rule_form.as_p }}
+<input type="submit" name="save_rule" value="Add rule" />
+</form>
+<div class="rule_values" style="display: none;">
+{% for entry in rule_form.get_all_options %}
+<div class="{{ entry.type }}">
+  <select>
+  {% for option in  entry.options %}
+    <option value={{ option.0 }}>{{ option.1 }}</option>
+  {% endfor %}
+  </select>
+</div>
+{% endfor %}
+</div>
+</div>
+
+<div id="custom">
+{% include "community/customize_display.html" %}
+</div>
+
+<div id="info">
+<p>Feel free to share the following links if you need it.</p>
+<ul>
+ <li><a href="{{ cl.secret }}/view/">Read only view for {{ cl.long_name }}</a></li>
+ <li><a href="{{ cl.secret }}/changes/feed/">Feed for every change in status of {{ cl.long_name }}</a></li>
+ <li><a href="{{ cl.secret }}/changes/significant/feed/">Feed for significant change in status of {{ cl.long_name }}</a></li>
+ <li><a href="{{ cl.secret }}/subscribe/">Subscribe to the mailing list for every change in status of {{ cl.long_name }}</a></li>
+ <li><a href="{{ cl.secret }}/subscribe/significant/">Subscribe to the mailing list for significant change in status of {{ cl.long_name }}</a></li>
+</ul>
+
+<p>Export your list to CSV format</p>
+<ul>
+ <li><a href="csv/">CSV for {{ cl.long_name }}</a></li>
+</ul>
+</div>
+
+</div>
+</div>
+
+<script type="text/javascript">
+//<![CDATA[
+var tabView = new YAHOO.widget.TabView('mytabs');
+var url = location.href.split('#'); 
+if (url[1]) { 
+  url[1] = "#"+url[1];
+  var tabs = tabView.get('tabs'); 
+  for (var i = 0; i < tabs.length; i++) { 
+    if (url[1].indexOf(tabs[i].get('href')) == 0) {
+      tabView.set('activeIndex', i);
+      break; 
+     } 
+  } 
+} 
+//]]>
+</script>
+
+{% endblock %}