Mercurial > kallithea

changeset 1747:8804715404c9 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
implements #193 journal stores information about deleting of repos - only admin journal does that now - added new info about creation of repo as fork
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 01 Dec 2011 03:11:26 +0200
parents 753aeb4a5c58
children a3ee2611e6e8
files rhodecode/lib/celerylib/tasks.py rhodecode/lib/helpers.py rhodecode/model/db.py
diffstat 3 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/celerylib/tasks.py	Thu Dec 01 02:35:29 2011 +0200
+++ b/rhodecode/lib/celerylib/tasks.py	Thu Dec 01 03:11:26 2011 +0200
@@ -384,6 +384,9 @@
             update_after_clone=update_after_clone)
     action_logger(cur_user, 'user_forked_repo:%s' % fork_name,
                    org_repo_name, '', Session)
+    
+    action_logger(cur_user, 'user_created_fork:%s' % fork_name,
+                   fork_name, '', Session)    
     # finally commit at latest possible stage
     Session.commit()
 
--- a/rhodecode/lib/helpers.py	Thu Dec 01 02:35:29 2011 +0200
+++ b/rhodecode/lib/helpers.py	Thu Dec 01 03:11:26 2011 +0200
@@ -389,6 +389,7 @@
 
     action_map = {'user_deleted_repo':(_('[deleted] repository'), None),
            'user_created_repo':(_('[created] repository'), None),
+           'user_created_fork':(_('[created] repository as fork'), None),
            'user_forked_repo':(_('[forked] repository'), get_fork_name),
            'user_updated_repo':(_('[updated] repository'), None),
            'admin_deleted_repo':(_('[delete] repository'), None),
@@ -428,6 +429,7 @@
     tmpl = """<img src="%s%s" alt="%s"/>"""
     map = {'user_deleted_repo':'database_delete.png',
            'user_created_repo':'database_add.png',
+           'user_created_fork':'arrow_divide.png',
            'user_forked_repo':'arrow_divide.png',
            'user_updated_repo':'database_edit.png',
            'admin_deleted_repo':'database_delete.png',
--- a/rhodecode/model/db.py	Thu Dec 01 02:35:29 2011 +0200
+++ b/rhodecode/model/db.py	Thu Dec 01 03:11:26 2011 +0200
@@ -347,7 +347,7 @@
     __table_args__ = {'extend_existing':True}
     user_log_id = Column("user_log_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
-    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
+    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True)
     repository_name = Column("repository_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     user_ip = Column("user_ip", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     action = Column("action", UnicodeText(length=1200000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
@@ -358,7 +358,7 @@
         return datetime.date(*self.action_date.timetuple()[:3])
 
     user = relationship('User')
-    repository = relationship('Repository')
+    repository = relationship('Repository',cascade='')
 
 
 class UsersGroup(Base, BaseModel):
@@ -509,7 +509,7 @@
 
     followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id', cascade='all')
 
-    logs = relationship('UserLog', cascade='all')
+    logs = relationship('UserLog')
 
     def __repr__(self):
         return "<%s('%s:%s')>" % (self.__class__.__name__,