Fixed bug in displaying initial commit message

templates/snippets/list_commit_detail.html

@@ -28,7 +28,11 @@ function listCommitDetails(url, t) {
             show(data['newdir'], '{% trans "New directories" %}');
             show(data['deldir'], '{% trans "Deleted directories" %}');
             if (!con) {
-                con = '<p>{% trans "No conflict in the merge." %}</p>';
+                if (data['init_commit']) {
+                    con = '<p>' + data['cmt_desc'] + '</p>';
+                } else {
+                    con = '<p>{% trans "No conflict in the merge." %}</p>';
+                }
             }
             $('#ls-ch').css('text-align','left').html(heading + time + con);
             $(window).resize();

thirdpart/seaserv/__init__.py

@@ -16,7 +16,7 @@ from service import get_repos, get_repo, get_commits, get_branches, remove_repo,
     list_personal_shared_repos, is_personal_repo, list_inner_pub_repos, \
     is_org_repo_owner, get_org_repo_owner, is_org_repo, get_file_size,\
     list_personal_repos_by_owner, get_repo_token_nonnull, get_repo_owner, \
-    server_repo_size, get_file_id_by_path, \
+    server_repo_size, get_file_id_by_path, get_commit, \
     get_repo_history_limit, set_repo_history_limit
 
 from service import get_binding_peerids, is_valid_filename, check_permission,\

thirdpart/seaserv/service.py

@@ -456,6 +456,14 @@ def get_org_repo_owner(repo_id):
     return owner
 
 # commit
+def get_commit(cmt_id):
+    """ Get a commit. """
+    try:
+        ret = seafserv_threaded_rpc.get_commit(cmt_id)
+    except SearpcError:
+        ret = None
+    return ret
+    
 def get_commits(repo_id, offset, limit):
     """Get commit lists."""
     try:

views.py

@@ -46,7 +46,8 @@ from seaserv import ccnet_rpc, ccnet_threaded_rpc, get_repos, get_emailusers, \
     get_org_repo_owner, is_passwd_set, get_file_size, check_quota, \
     get_related_users_by_repo, get_related_users_by_org_repo, HtmlDiff, \
     get_session_info, get_group_repoids, get_repo_owner, get_file_id_by_path, \
-    get_repo_history_limit, set_repo_history_limit, MAX_UPLOAD_FILE_SIZE
+    get_repo_history_limit, set_repo_history_limit, MAX_UPLOAD_FILE_SIZE, \
+    get_commit
 from pysearpc import SearpcError
 
 from signals import repo_created, repo_deleted
@@ -838,6 +839,7 @@ def get_diff(repo_id, arg1, arg2):
 
     return lists
 
+@login_required
 def repo_history_changes(request, repo_id):
     changes = {}
     content_type = 'application/json; charset=utf-8'
@@ -851,17 +853,7 @@ def repo_history_changes(request, repo_id):
         return HttpResponse(json.dumps(changes),
                             content_type=content_type)
 
-    password_set = False
-    if repo.props.encrypted:
-        try:
-            ret = seafserv_rpc.is_passwd_set(repo_id, request.user.username)
-            if ret == 1:
-                password_set = True
-        except:
-            return HttpResponse(json.dumps(changes),
-                                content_type=content_type)
-
-    if repo.props.encrypted and not password_set:
+    if repo.encrypted and not is_passwd_set(repo_id, request.user.username):
         return HttpResponse(json.dumps(changes),
                             content_type=content_type)
 
@@ -872,8 +864,14 @@ def repo_history_changes(request, repo_id):
 
     changes = get_diff(repo_id, '', commit_id)
 
-    return HttpResponse(json.dumps(changes),
-                        content_type=content_type)
+    if get_commit(commit_id).parent_id is None:
+        # A commit is a first commit only if it's parent id is None.
+        changes['init_commit'] = True
+        changes['cmt_desc'] = repo.desc
+    else:
+        changes['init_commit'] = False
+    
+    return HttpResponse(json.dumps(changes), content_type=content_type)
 
 @login_required
 def modify_token(request, repo_id):