Modify org personal page, and add org root

organizations/templates/organizations/personal.html

@@ -1,5 +1,5 @@
 {% extends "org_base.html" %}
-{% load seahub_tags group_avatar_tags %}
+{% load seahub_tags avatar_tags group_avatar_tags %}
 {% load url from future %}
 
 {% block nav_org_personal_class %}class="cur"{% endblock %}
@@ -9,6 +9,18 @@
 {% endblock %}
 
 {% block left_panel %}
+<!-- 我的基本信息 -->
+<div class="info-item">
+<h3 class="info-item-top">我的基本信息</h3>
+<div class="info-item-bottom home-profile ovhd">
+    <a href="{{ SITE_ROOT }}profile/" class="no-deco">{% avatar request.user 48 %}</a>
+{% if nickname %}
+<p class="fleft">{{ nickname }}</p>
+{% else %}
+<p class="fleft">暂无昵称 <a href="{{ SITE_ROOT }}profile/"><img src="{{ MEDIA_URL }}img/edit_12.png" alt="编辑" title="编辑" /></a></p>
+{% endif %}
+</div>
+</div>
 <!-- 我的群组 -->
 {% include "snippets/my_groups.html" %}
 {% endblock %}

organizations/urls.py

@@ -6,7 +6,8 @@ from views import *
 urlpatterns = patterns('',
     url(r'^create/$', create_org, name='create_org'),
     url(r'^messages/$', org_msg, name='org_msg'),
-    url(r'^(?P<url_prefix>[^/]+)/$', org_info, name='org_info'),
+    url(r'^(?P<url_prefix>[^/]+)/$', org_root, name='org_root'),
+    url(r'^(?P<url_prefix>[^/]+)/public/$', org_public, name='org_public'),
     url(r'^(?P<url_prefix>[^/]+)/personal/$', org_personal, name='org_personal'),
     url(r'^(?P<url_prefix>[^/]+)/repo/create/$', org_repo_create, name='org_repo_create'),
     url(r'^(?P<url_prefix>[^/]+)/innerpubrepo/create/$', org_inner_pub_repo_create, name='org_inner_pub_repo_create'),

organizations/views.py

@@ -27,6 +27,7 @@ from signals import org_user_added
 from utils import validate_org_repo_owner
 from group.views import GroupListView
 from notifications.models import UserNotification
+from profile.models import Profile
 from share.models import FileShare
 from share.forms import RepoShareForm
 from registration.models import RegistrationProfile
@@ -54,7 +55,7 @@ def create_org(request):
                 # create_org(org_name, url_prefix, username)
                 ccnet_threaded_rpc.create_org(org_name, url_prefix, username)
                 return HttpResponseRedirect(\
-                    reverse(org_info, args=[url_prefix]))
+                    reverse(org_public, args=[url_prefix]))
             except SearpcError, e:
                 return render_error(request, e.msg, extra_ctx={
                         'base_template': 'myhome_base.html',
@@ -68,7 +69,11 @@ def create_org(request):
             }, context_instance=RequestContext(request))
 
 @login_required
-def org_info(request, url_prefix):
+def org_root(request, url_prefix):
+    return HttpResponseRedirect(reverse(org_personal, args=[url_prefix]))
+    
+@login_required
+def org_public(request, url_prefix):
     """
     Show org info page, list org inner pub repos.
     """
@@ -78,7 +83,7 @@ def org_info(request, url_prefix):
 
     repos = list_org_inner_pub_repos(org.org_id, request.user.username)
 
-    return render_to_response('organizations/org_info.html', {
+    return render_to_response('organizations/org_public.html', {
             'org': org,
             'repos': repos,
             'create_shared_repo': True,
@@ -119,6 +124,13 @@ def org_personal(request, url_prefix):
         m.contact_email = m.email
         contacts.append(m)
 
+    # Get nickname
+    if not Profile.objects.filter(user=request.user.username):
+        nickname = ''
+    else:
+        profile = Profile.objects.filter(user=request.user.username)[0]
+        nickname = profile.nickname
+        
     return render_to_response('organizations/personal.html', {
             'owned_repos': owned_repos,
             "in_repos": in_repos,
@@ -128,6 +140,7 @@ def org_personal(request, url_prefix):
             'contacts': contacts,
             'create_shared_repo': False,
             'allow_public_share': True,
+            'nickname': nickname,
             }, context_instance=RequestContext(request))
 
 @login_required
@@ -175,7 +188,7 @@ def org_inner_pub_repo_create(request, url_prefix):
 def unset_org_inner_pub_repo(request, url_prefix, repo_id):
     org = get_user_current_org(request.user.username, url_prefix)
     if not org:
-        return HttpResponseRedirect(reverse(org_info, args=[url_prefix]))
+        return HttpResponseRedirect(reverse(org_public, args=[url_prefix]))
        
     try:
         seafserv_threaded_rpc.unset_org_inner_pub_repo(org.org_id, repo_id)
@@ -351,7 +364,7 @@ def org_msg(request):
                 from_email = d['from_email']
                 org_name = d['org_name']
                 org_prefix = d['org_prefix']
-                org_url = reverse('org_info', args=[org_prefix])
+                org_url = reverse('org_public', args=[org_prefix])
                 
                 msg = u'%s 将你加入到团体 <a href="%s">%s</a>' % (
                     from_email, org_url, org_name)

templates/myhome.html

@@ -8,7 +8,7 @@
 <div class="info-item">
 <h3 class="info-item-top">我的基本信息</h3>
 <div class="info-item-bottom home-profile ovhd">
-    <a href="{{ SITE_ROOT }}profile/" class="no-deco">{% avatar myname 48 %}</a>
+    <a href="{{ SITE_ROOT }}profile/" class="no-deco">{% avatar request.user 48 %}</a>
 {% if nickname %}
 <p class="fleft">{{ nickname }}</p>
 {% else %}

templates/org_base.html

@@ -8,7 +8,7 @@
         <a href="{% url 'organizations.views.org_personal' org.url_prefix %}" {% block nav_org_personal_class %}{% endblock %}>个人页面</a>
     </li>
     <li>
-        <a href="{% url 'organizations.views.org_info' org.url_prefix %}" {% block nav_org_class %}{% endblock %}>公共资料</a>
+        <a href="{% url 'organizations.views.org_public' org.url_prefix %}" {% block nav_org_class %}{% endblock %}>公共资料</a>
     </li>
     <li>
         <a href="{% url 'organizations.views.org_groups' org.url_prefix %}" {% block nav_group_class %}{% endblock %}>群组</a>

urls.py

@@ -78,7 +78,6 @@ urlpatterns = patterns('',
     (r'^file/move/$', file_move),
     (r'^seafile_access_check/$', seafile_access_check),                       
     url(r'^org/remove/(?P<org_id>[\d]+)/$', org_remove, name="org_remove"),
-    # (r'^org/$', org_info),
 
     (r'^useradmin/add/$', user_add),
     (r'^useradmin/remove/(?P<user_id>[^/]+)/$', user_remove),

views.py

@@ -915,7 +915,6 @@ def myhome(request):
 
 
     return render_to_response('myhome.html', {
-            "myname": email,
             "nickname": nickname,
             "owned_repos": owned_repos,
             "quota_usage": quota_usage,
@@ -2017,25 +2016,6 @@ def org_remove(request, org_id):
     
     return HttpResponseRedirect(reverse('sys_org_admin'))
 
-# @login_required
-# def org_info(request):
-#     if not request.user.org:
-#         raise Http404
-
-#     org = request.user.org
-    
-#     org_members = ccnet_threaded_rpc.get_org_emailusers(org.url_prefix, 0, MAX_INT)
-#     for member in org_members:
-#         member.short_username = member.email.split('@')[0]
-
-#     groups = get_org_groups(org.org_id, -1, -1)
-    
-#     return render_to_response('org_info.html', {
-#             'org': org,
-#             'org_users': org_members,
-#             'groups': groups,
-#             }, context_instance=RequestContext(request))
-
 @login_required
 def file_upload_progress_page(request):
     '''