Patch for multiple repository. Column repository added to table. Fixes trac-hacks#14

Author: ntesteca

code_comments/comment.py

@@ -66,9 +66,9 @@ def validate(self):
 
     def href(self):
         if self.is_comment_to_file:
-            href = self.req.href.browser(self.path, rev=self.revision, codecomment=self.id)
+            href = self.req.href.browser(self.repository, self.path, rev=self.revision, codecomment=self.id)
         elif self.is_comment_to_changeset:
-            href = self.req.href.changeset(self.revision, codecomment=self.id)
+            href = self.req.href.changeset(self.revision, self.repository, codecomment=self.id)
         elif self.is_comment_to_attachment:
             href = self.req.href('/attachment/ticket/%d/%s' % (self.attachment_ticket, self.attachment_filename), codecomment=self.id)
         if self.line:

code_comments/db.py

@@ -4,7 +4,7 @@
 from trac.db.api import DatabaseManager
 
 # Database version identifier for upgrades.
-db_version = 2
+db_version = 3
 
 # Database schema
 schema = {
@@ -17,6 +17,7 @@
         Column('line', type='int'),
         Column('author'),
         Column('time', type='int'),
+        Column('repository'),
         Index(['path']),
         Index(['author']),
     ],
@@ -50,12 +51,16 @@ def upgrade_from_1_to_2(env, db):
         cursor.execute(stmt)
     for line in lines:
         ins = 'INSERT INTO code_comments (%s) VALUES (%s)' % (','.join(columns), ','.join(['\'%s\'' % str(v).replace('\'','\'\'') for v in line]))
-        print ins
         cursor.execute(ins)
     cursor.execute('DROP TABLE tmp_code_comments')
 
+def upgrade_from_2_to_3(env, db):
+    cursor = db.cursor()
+    cursor.execute('ALTER TABLE code_comments ADD COLUMN repository text')
+
 upgrade_map = {
-        2: upgrade_from_1_to_2
+        2: upgrade_from_1_to_2,
+        3: upgrade_from_2_to_3,
     }
 
 

code_comments/htdocs/code-comments.js

@@ -164,7 +164,7 @@ jQuery(function($) {
 					self.$el.dialog('close');
 				}
 			};
-			this.collection.create({text: text, author: CodeComments.username, path: CodeComments.path, revision: CodeComments.revision, line: line}, options);
+			this.collection.create({text: text, author: CodeComments.username, path: CodeComments.path, repository: CodeComments.repository, revision: CodeComments.revision, line: line}, options);
 		},
 		previewThrottled: $.throttle(1500, function(e) { return this.preview(e); }),
 		preview: function(e) {

code_comments/web.py

@@ -105,10 +105,10 @@ def templates_js_data(self):
         return data
 
     def changeset_js_data(self, req, data):
-        return {'page': 'changeset', 'revision': data['new_rev'], 'path': '', 'selectorToInsertBefore': 'div.diff:first'}
+        return {'page': 'changeset', 'repository': data['reponame'], 'revision': data['new_rev'], 'path': '', 'selectorToInsertBefore': 'div.diff:first'}
 
     def browser_js_data(self, req, data):
-        return {'page': 'browser', 'revision': data['rev'], 'path': data['path'], 'selectorToInsertBefore': 'table#info'}
+        return {'page': 'browser', 'repository': data['reponame'], 'revision': data['rev'], 'path': data['path'], 'selectorToInsertBefore': 'table#info'}
 
     def attachment_js_data(self, req, data):
         path = req.path_info.replace('/attachment/', 'attachment:/')