Enable setting of token in seahub

media/css/seahub.css

@@ -80,3 +80,12 @@ input[type=submit]:hover { border: 1px solid #80B0B0; background: #FFF; }
 #main form label { display: inline-block; margin:2px 0px; }
 /* form */
 /* forms */
+
+/* popup dialog */
+#basic-modal-content {display:none;}
+#simplemodal-overlay {background-color:#000; cursor:wait;}
+#simplemodal-container { background-color:#fff; border:3px solid #080; padding: 8px; }
+#simplemodal-container code {background:#141414; border-left:3px solid #65B43D; color:#bbb; display:block; font-size:12px; margin-bottom:12px; padding:4px 6px 6px;}
+#simplemodal-container a {color:#ddd;}
+#simplemodal-container a.modalCloseImg {background:url(../img/x.png) no-repeat; width:25px; height:29px; display:inline; z-index:3200; position:absolute; top:-15px; right:-16px; cursor:pointer;}
+#simplemodal-container h3 {color:#84b8d9;}

media/js/jquery.simplemodal.1.4.1.min.js

@@ -0,0 +1,25 @@
+/*
+ * SimpleModal 1.4.1 - jQuery Plugin
+ * http://www.ericmmartin.com/projects/simplemodal/
+ * Copyright (c) 2010 Eric Martin (http://twitter.com/ericmmartin)
+ * Dual licensed under the MIT and GPL licenses
+ * Revision: $Id: jquery.simplemodal.js 261 2010-11-05 21:16:20Z emartin24 $
+ */
+(function(d){var k=d.browser.msie&&parseInt(d.browser.version)===6&&typeof window.XMLHttpRequest!=="object",m=d.browser.msie&&parseInt(d.browser.version)===7,l=null,f=[];d.modal=function(a,b){return d.modal.impl.init(a,b)};d.modal.close=function(){d.modal.impl.close()};d.modal.focus=function(a){d.modal.impl.focus(a)};d.modal.setContainerDimensions=function(){d.modal.impl.setContainerDimensions()};d.modal.setPosition=function(){d.modal.impl.setPosition()};d.modal.update=function(a,b){d.modal.impl.update(a,
+b)};d.fn.modal=function(a){return d.modal.impl.init(this,a)};d.modal.defaults={appendTo:"body",focus:true,opacity:50,overlayId:"simplemodal-overlay",overlayCss:{},containerId:"simplemodal-container",containerCss:{},dataId:"simplemodal-data",dataCss:{},minHeight:null,minWidth:null,maxHeight:null,maxWidth:null,autoResize:false,autoPosition:true,zIndex:1E3,close:true,closeHTML:'<a class="modalCloseImg" title="Close"></a>',closeClass:"simplemodal-close",escClose:true,overlayClose:false,position:null,
+persist:false,modal:true,onOpen:null,onShow:null,onClose:null};d.modal.impl={d:{},init:function(a,b){var c=this;if(c.d.data)return false;l=d.browser.msie&&!d.boxModel;c.o=d.extend({},d.modal.defaults,b);c.zIndex=c.o.zIndex;c.occb=false;if(typeof a==="object"){a=a instanceof jQuery?a:d(a);c.d.placeholder=false;if(a.parent().parent().size()>0){a.before(d("<span></span>").attr("id","simplemodal-placeholder").css({display:"none"}));c.d.placeholder=true;c.display=a.css("display");if(!c.o.persist)c.d.orig=
+a.clone(true)}}else if(typeof a==="string"||typeof a==="number")a=d("<div></div>").html(a);else{alert("SimpleModal Error: Unsupported data type: "+typeof a);return c}c.create(a);c.open();d.isFunction(c.o.onShow)&&c.o.onShow.apply(c,[c.d]);return c},create:function(a){var b=this;f=b.getDimensions();if(b.o.modal&&k)b.d.iframe=d('<iframe src="javascript:false;"></iframe>').css(d.extend(b.o.iframeCss,{display:"none",opacity:0,position:"fixed",height:f[0],width:f[1],zIndex:b.o.zIndex,top:0,left:0})).appendTo(b.o.appendTo);
+b.d.overlay=d("<div></div>").attr("id",b.o.overlayId).addClass("simplemodal-overlay").css(d.extend(b.o.overlayCss,{display:"none",opacity:b.o.opacity/100,height:b.o.modal?f[0]:0,width:b.o.modal?f[1]:0,position:"fixed",left:0,top:0,zIndex:b.o.zIndex+1})).appendTo(b.o.appendTo);b.d.container=d("<div></div>").attr("id",b.o.containerId).addClass("simplemodal-container").css(d.extend(b.o.containerCss,{display:"none",position:"fixed",zIndex:b.o.zIndex+2})).append(b.o.close&&b.o.closeHTML?d(b.o.closeHTML).addClass(b.o.closeClass):
+"").appendTo(b.o.appendTo);b.d.wrap=d("<div></div>").attr("tabIndex",-1).addClass("simplemodal-wrap").css({height:"100%",outline:0,width:"100%"}).appendTo(b.d.container);b.d.data=a.attr("id",a.attr("id")||b.o.dataId).addClass("simplemodal-data").css(d.extend(b.o.dataCss,{display:"none"})).appendTo("body");b.setContainerDimensions();b.d.data.appendTo(b.d.wrap);if(k||l)b.fixIE()},bindEvents:function(){var a=this;d("."+a.o.closeClass).bind("click.simplemodal",function(b){b.preventDefault();a.close()});
+a.o.modal&&a.o.close&&a.o.overlayClose&&a.d.overlay.bind("click.simplemodal",function(b){b.preventDefault();a.close()});d(document).bind("keydown.simplemodal",function(b){if(a.o.modal&&b.keyCode===9)a.watchTab(b);else if(a.o.close&&a.o.escClose&&b.keyCode===27){b.preventDefault();a.close()}});d(window).bind("resize.simplemodal",function(){f=a.getDimensions();a.o.autoResize?a.setContainerDimensions():a.o.autoPosition&&a.setPosition();if(k||l)a.fixIE();else if(a.o.modal){a.d.iframe&&a.d.iframe.css({height:f[0],
+width:f[1]});a.d.overlay.css({height:f[0],width:f[1]})}})},unbindEvents:function(){d("."+this.o.closeClass).unbind("click.simplemodal");d(document).unbind("keydown.simplemodal");d(window).unbind("resize.simplemodal");this.d.overlay.unbind("click.simplemodal")},fixIE:function(){var a=this,b=a.o.position;d.each([a.d.iframe||null,!a.o.modal?null:a.d.overlay,a.d.container],function(c,h){if(h){var g=h[0].style;g.position="absolute";if(c<2){g.removeExpression("height");g.removeExpression("width");g.setExpression("height",
+'document.body.scrollHeight > document.body.clientHeight ? document.body.scrollHeight : document.body.clientHeight + "px"');g.setExpression("width",'document.body.scrollWidth > document.body.clientWidth ? document.body.scrollWidth : document.body.clientWidth + "px"')}else{var e;if(b&&b.constructor===Array){c=b[0]?typeof b[0]==="number"?b[0].toString():b[0].replace(/px/,""):h.css("top").replace(/px/,"");c=c.indexOf("%")===-1?c+' + (t = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"':
+parseInt(c.replace(/%/,""))+' * ((document.documentElement.clientHeight || document.body.clientHeight) / 100) + (t = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"';if(b[1]){e=typeof b[1]==="number"?b[1].toString():b[1].replace(/px/,"");e=e.indexOf("%")===-1?e+' + (t = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft) + "px"':parseInt(e.replace(/%/,""))+' * ((document.documentElement.clientWidth || document.body.clientWidth) / 100) + (t = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft) + "px"'}}else{c=
+'(document.documentElement.clientHeight || document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (t = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"';e='(document.documentElement.clientWidth || document.body.clientWidth) / 2 - (this.offsetWidth / 2) + (t = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft) + "px"'}g.removeExpression("top");g.removeExpression("left");g.setExpression("top",
+c);g.setExpression("left",e)}}})},focus:function(a){var b=this;a=a&&d.inArray(a,["first","last"])!==-1?a:"first";var c=d(":input:enabled:visible:"+a,b.d.wrap);setTimeout(function(){c.length>0?c.focus():b.d.wrap.focus()},10)},getDimensions:function(){var a=d(window);return[d.browser.opera&&d.browser.version>"9.5"&&d.fn.jquery<"1.3"||d.browser.opera&&d.browser.version<"9.5"&&d.fn.jquery>"1.2.6"?a[0].innerHeight:a.height(),a.width()]},getVal:function(a,b){return a?typeof a==="number"?a:a==="auto"?0:
+a.indexOf("%")>0?parseInt(a.replace(/%/,""))/100*(b==="h"?f[0]:f[1]):parseInt(a.replace(/px/,"")):null},update:function(a,b){var c=this;if(!c.d.data)return false;c.d.origHeight=c.getVal(a,"h");c.d.origWidth=c.getVal(b,"w");c.d.data.hide();a&&c.d.container.css("height",a);b&&c.d.container.css("width",b);c.setContainerDimensions();c.d.data.show();c.o.focus&&c.focus();c.unbindEvents();c.bindEvents()},setContainerDimensions:function(){var a=this,b=k||m,c=a.d.origHeight?a.d.origHeight:d.browser.opera?
+a.d.container.height():a.getVal(b?a.d.container[0].currentStyle.height:a.d.container.css("height"),"h");b=a.d.origWidth?a.d.origWidth:d.browser.opera?a.d.container.width():a.getVal(b?a.d.container[0].currentStyle.width:a.d.container.css("width"),"w");var h=a.d.data.outerHeight(true),g=a.d.data.outerWidth(true);a.d.origHeight=a.d.origHeight||c;a.d.origWidth=a.d.origWidth||b;var e=a.o.maxHeight?a.getVal(a.o.maxHeight,"h"):null,i=a.o.maxWidth?a.getVal(a.o.maxWidth,"w"):null;e=e&&e<f[0]?e:f[0];i=i&&i<
+f[1]?i:f[1];var j=a.o.minHeight?a.getVal(a.o.minHeight,"h"):"auto";c=c?a.o.autoResize&&c>e?e:c<j?j:c:h?h>e?e:a.o.minHeight&&j!=="auto"&&h<j?j:h:j;e=a.o.minWidth?a.getVal(a.o.minWidth,"w"):"auto";b=b?a.o.autoResize&&b>i?i:b<e?e:b:g?g>i?i:a.o.minWidth&&e!=="auto"&&g<e?e:g:e;a.d.container.css({height:c,width:b});a.d.wrap.css({overflow:h>c||g>b?"auto":"visible"});a.o.autoPosition&&a.setPosition()},setPosition:function(){var a=this,b,c;b=f[0]/2-a.d.container.outerHeight(true)/2;c=f[1]/2-a.d.container.outerWidth(true)/
+2;if(a.o.position&&Object.prototype.toString.call(a.o.position)==="[object Array]"){b=a.o.position[0]||b;c=a.o.position[1]||c}else{b=b;c=c}a.d.container.css({left:c,top:b})},watchTab:function(a){var b=this;if(d(a.target).parents(".simplemodal-container").length>0){b.inputs=d(":input:enabled:visible:first, :input:enabled:visible:last",b.d.data[0]);if(!a.shiftKey&&a.target===b.inputs[b.inputs.length-1]||a.shiftKey&&a.target===b.inputs[0]||b.inputs.length===0){a.preventDefault();b.focus(a.shiftKey?"last":
+"first")}}else{a.preventDefault();b.focus()}},open:function(){var a=this;a.d.iframe&&a.d.iframe.show();if(d.isFunction(a.o.onOpen))a.o.onOpen.apply(a,[a.d]);else{a.d.overlay.show();a.d.container.show();a.d.data.show()}a.o.focus&&a.focus();a.bindEvents()},close:function(){var a=this;if(!a.d.data)return false;a.unbindEvents();if(d.isFunction(a.o.onClose)&&!a.occb){a.occb=true;a.o.onClose.apply(a,[a.d])}else{if(a.d.placeholder){var b=d("#simplemodal-placeholder");if(a.o.persist)b.replaceWith(a.d.data.removeClass("simplemodal-data").css("display",
+a.display));else{a.d.data.hide().remove();b.replaceWith(a.d.orig)}}else a.d.data.hide().remove();a.d.container.hide().remove();a.d.overlay.hide();a.d.iframe&&a.d.iframe.hide().remove();setTimeout(function(){a.d.overlay.remove();a.d={}},10)}}}})(jQuery);

profile/models.py

@@ -6,3 +6,7 @@ class UserProfile(models.Model):
     user = models.ForeignKey(User, unique=True)
     ccnet_user_id = models.CharField(max_length=40, blank=True)
 
+class UserCcnetConf(models.Model):
+    user = models.ForeignKey(User, unique=True)
+    ccnet_user_id = models.CharField(max_length=40, unique=True)
+    ccnet_profile = models.TextField()

profile/templates/profile/profile.html

@@ -3,7 +3,8 @@
 
 {% block left_panel %}
 <ul>
-  <li><a href="{% url profile_setting %}">修改 Ccnet 设置</a></li>
+  <li><a href="{% url profile_setting %}">修改 Seafile ID</a></li>
+  <li><a href="{% url ccnet_profile_setting %}">上传 Seafile 配置文件</a></li>
   <li><a href="{% url avatar_change %}">修改头像</a></li>
   <li><a href="{% url avatar_delete %}">删除不用的头像</a></li>
   <li><a href="{{ SITE_ROOT }}accounts/password/change/">修改密码</a></li>

profile/templates/profile/set_ccnet_conf.html

@@ -0,0 +1,14 @@
+{% extends "profile/profile_base.html" %}
+
+{% block content %}
+
+<form action="" method="post">
+    {% if error_msg %}
+    <p class="error">{{ error_msg }}</p>
+    {% endif %}
+    <label>Seafile 配置:</label><br/>
+    <textarea id="id_ccnet_profile" name="ccnet_profile">{{ ccnet_profile }}</textarea>
+    <input type="submit" value="Submit" />
+</form>
+
+{% endblock %}

profile/urls.py

@@ -2,5 +2,7 @@ from django.conf.urls.defaults import *
 
 urlpatterns = patterns('profile.views',
     url(r'^$', 'show_profile'),
+    url(r'^ccnet/$', 'get_ccnet_profile'),
     url(r'^edit/$', 'set_profile', name="profile_setting"),
+    url(r'^edit/ccnet/$', 'set_ccnet_profile', name="ccnet_profile_setting"),
 )

profile/views.py

@@ -8,7 +8,7 @@ from django.core.urlresolvers import reverse
 import datetime
 
 from forms import SetUserProfileForm
-from models import UserProfile
+from models import UserProfile, UserCcnetConf
 from seaserv import ccnet_rpc
 
 @login_required
@@ -62,3 +62,44 @@ def set_profile(request):
                               { 'error_msg': error_msg,
                                 'origin_id': origin_id },
                               context_instance=RequestContext(request))
+
+
+@login_required
+def get_ccnet_profile(request):
+    try:
+        ccnet_conf = UserCcnetConf.objects.get(user=request.user)
+        return HttpResponse(ccnet_conf.ccnet_profile)
+    except UserCcnetConf.DoesNotExist:
+        return HttpResponse("")
+
+
+@login_required
+def set_ccnet_profile(request):
+    try:
+        profile = request.user.get_profile()
+    except UserProfile.DoesNotExist:
+        return HttpResponse("Error: You have not set seafile id yet.")
+    ccnet_id = profile.ccnet_user_id
+
+    if request.method == 'POST':
+        ccnet_profile = request.POST.get('ccnet_profile', None)
+        try:
+            ccnet_conf = UserCcnetConf.objects.get(ccnet_user_id=ccnet_id)
+            ccnet_conf.ccnet_profile = ccnet_profile
+            ccnet_conf.save()
+        except UserCcnetConf.DoesNotExist:
+            ccnet_conf = UserCcnetConf(user=request.user,
+                                       ccnet_user_id=ccnet_id,
+                                       ccnet_profile=ccnet_profile)
+            ccnet_conf.save()
+        return HttpResponse("ok")
+    else:
+         try:
+             ccnet_conf = UserCcnetConf.objects.get(ccnet_user_id=ccnet_id)
+             ccnet_profile = ccnet_conf.ccnet_profile
+         except UserCcnetConf.DoesNotExist:
+             ccnet_profile = ""
+
+    return render_to_response('profile/set_ccnet_conf.html',
+                              { 'ccnet_profile': ccnet_profile },
+                              context_instance=RequestContext(request))

templates/base.html

@@ -6,6 +6,8 @@
 <meta name="keywords" content="文件 共享" />
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub.css" />
 <link rel="icon" type="image/png" href="{{ MEDIA_URL }}img/favicon.png" />
+<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.min.js"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.simplemodal.1.4.1.min.js"></script>
 
 {% block extra_style %}{% endblock %}
 {% block extra_script %}{% endblock %}

templates/myrepos.html

@@ -10,7 +10,7 @@
 
     {% for repo in owned_repos %}
     <tr>
-        <td><a href="/repo/{{ repo.props.id }}">{{ repo.props.name }}</a></td>
+        <td><a href="/repo/{{ repo.props.id }}/">{{ repo.props.name }}</a></td>
         <td>{{ repo.props.id }}</td>
         <td>{{ repo.props.desc }}</td>
     </tr>

templates/repo.html

@@ -4,6 +4,13 @@
 {% block right_panel %}
 
 <h2>{{repo.props.name}}</h2>
+
+<form id="modify-token-form" action="{{ SITE_ROOT }}repo/token/modify/{{repo.props.id}}/" method="post">
+    <p>新口令:</p>
+    <input id="id_token" type="text" name="token" /><br/>
+    <input id="id_summit" type="submit" value="提交" />
+</form>
+
 <table class="default">
     <tr>
         <td>ID</td>
@@ -13,6 +20,14 @@
         <td>描述</td>
         <td>{{repo.props.desc}}</td>
     </tr>
+    <tr>
+        <td>访问口令</td>
+        {% if is_owner %}
+        <td>{{token}} <input type="button" id="modify-token-btn" value="修改" /></td>
+        {% else %}
+        <td>只有拥有者可见</td>
+        {% endif %}
+    </tr>
 </table>
 
 <h3>分支</h3>
@@ -47,3 +62,15 @@
 </table>
 
 {% endblock %}
+
+{% block extra_script %}
+<script type="text/javascript">
+$(function() {
+    $("#modify-token-btn").click(function() {
+        $("#modify-token-form").modal({appendTo: "#main"}); 
+    });
+    
+    $("#modify-token-form").hide();
+})
+</script>
+{% endblock %}

urls.py

@@ -1,7 +1,7 @@
 from django.conf.urls.defaults import *
 from django.conf import settings
 from seahub.views import root, home, peers, groups, myhome, myrepos, \
-    repo, group, group_add_repo
+    repo, group, group_add_repo, modify_token
 
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
@@ -29,6 +29,7 @@ urlpatterns = patterns('',
     (r'^group/(?P<group_id>[^/]+)/addrepo/$', group_add_repo),
     (r'^repo/(?P<repo_id>[^/]+)/$', repo),
     (r'^repos/my/$', myrepos),
+    (r'^repo/token/modify/(?P<repo_id>[^/]+)/$', modify_token),
 
     (r'^avatar/', include('avatar.urls')),
     (r'^profile/', include('seahub.profile.urls')),

views.py

@@ -103,15 +103,27 @@ def group_add_repo(request, group_id):
             }, context_instance=RequestContext(request))
 
 
+
 def repo(request, repo_id):
     # TODO: check permission
     repo = get_repo(repo_id)
     commits = get_commits(repo_id)
     branches = get_branches(repo_id)
+
+    token = ""
+    is_owner = False
+    if request.user.is_authenticated():
+        cid = get_user_cid(request.user)
+        if seafile_rpc.is_repo_owner(cid, repo_id):
+            is_owner = True
+            token = seafile_rpc.get_repo_token(repo_id)
+
     return render_to_response('repo.html', {
             "repo": repo,
             "commits": commits,
             "branches": branches,
+            "is_owner": is_owner,
+            "token": token,
             }, context_instance=RequestContext(request))
 
 @login_required
@@ -123,6 +135,19 @@ def repo_share(request, repo_id):
             }, context_instance=RequestContext(request))
 
 
+@login_required
+def modify_token(request, repo_id):
+    cid = get_user_cid(request.user)
+    if not seafile_rpc.is_repo_owner(cid, repo_id):
+        return HttpResponseRedirect(reverse(repo, args=[repo_id]))
+
+    token = request.POST.get('token', '')
+    if token:
+        seafile_rpc.set_repo_token(repo_id, token)
+
+    return HttpResponseRedirect(reverse(repo, args=[repo_id]))
+    
+
 @login_required
 def myhome(request):
     ccnet_user_id = ""
@@ -152,6 +177,7 @@ def mypeers(request):
 def myrepos(request):
     cid = get_user_cid(request.user)
     owned_repos = seafile_rpc.list_owned_repos(cid)
+
     return render_to_response('myrepos.html', {
             'owned_repos': owned_repos,
             }, context_instance=RequestContext(request))