kallithea Changeset - bc2d8c03c050

Changeset - bc2d8c03c050

Parent rev.

Child rev.

[Not reviewed]

beta

0 10 0

Marcin Kuzminski - 13 years ago 2012-06-03 00:40:14
marcin@python-works.com

Implemented #467 Journal logs comments on changesets
- added created/updated user action to journal
- added created/updated users group action journal
- added ip adresses to most of action_log calls to track IP changes
- rewrote action_parser to simpler and more efficient solution

10 files changed with 103 insertions and 67 deletions:

rhodecode/controllers/admin/repos.py

rhodecode/controllers/admin/users.py

rhodecode/controllers/admin/users_groups.py

rhodecode/controllers/changeset.py

rhodecode/controllers/journal.py

rhodecode/controllers/settings.py

rhodecode/lib/helpers.py

rhodecode/lib/utils.py

rhodecode/templates/admin/admin_log.html

rhodecode/templates/journal/journal_data.html

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -148,16 +148,18 @@ class ReposController(BaseController): @@
                 h.flash(_('created repository %s') % form_result['repo_name'],
                     category='success')
             if request.POST.get('user_created'):
                 # created by regular non admin user
                 action_logger(self.rhodecode_user, 'user_created_repo',
                               form_result['repo_name_full'], '', self.sa)
                               form_result['repo_name_full'], self.ip_addr,
                               self.sa)
             else:
                 action_logger(self.rhodecode_user, 'admin_created_repo',
                               form_result['repo_name_full'], '', self.sa)
                               form_result['repo_name_full'], self.ip_addr,
                               self.sa)
             Session.commit()
         except formencode.Invalid, errors:
             c.new_repo = errors.value['repo_name']
             if request.POST.get('user_created'):
@@ @@ -209,13 +211,13 @@ class ReposController(BaseController): @@
             repo = repo_model.update(repo_name, form_result)
             invalidate_cache('get_repo_cached_%s' % repo_name)
             h.flash(_('Repository %s updated successfully' % repo_name),
                     category='success')
             changed_name = repo.repo_name
             action_logger(self.rhodecode_user, 'admin_updated_repo',
-                              changed_name, '', self.sa)
+                              changed_name, self.ip_addr, self.sa)
             Session.commit()
         except formencode.Invalid, errors:
             defaults = self.__load_data(repo_name)
             defaults.update(errors.value)
             return htmlfill.render(
                 render('admin/repos/repo_edit.html'),
@@ @@ -250,13 +252,13 @@ class ReposController(BaseController): @@
                       ' in order to rescan repositories') % repo_name,
                       category='error')
             return redirect(url('repos'))
         try:
             action_logger(self.rhodecode_user, 'admin_deleted_repo',
-                              repo_name, '', self.sa)
+                              repo_name, self.ip_addr, self.sa)
             repo_model.delete(repo)
             invalidate_cache('get_repo_cached_%s' % repo_name)
             h.flash(_('deleted repository %s') % repo_name, category='success')
             Session.commit()
         except IntegrityError, e:
             if e.message.find('repositories_fork_id_fkey') != -1:

rhodecode/controllers/admin/users.py

➞

Show inline comments

@@ @@ -39,12 +39,13 @@ from rhodecode.lib.auth import LoginRequ @@
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import User, Permission
 from rhodecode.model.forms import UserForm
 from rhodecode.model.user import UserModel
 from rhodecode.model.meta import Session
 from rhodecode.lib.utils import action_logger
 log = logging.getLogger(__name__)
 class UsersController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
@@ @@ -73,16 +74,18 @@ class UsersController(BaseController): @@
         user_model = UserModel()
         user_form = UserForm()()
         try:
             form_result = user_form.to_python(dict(request.POST))
             user_model.create(form_result)
             h.flash(_('created user %s') % form_result['username'],
             usr = form_result['username']
             action_logger(self.rhodecode_user, 'admin_created_user:%s' % usr,
                           None, self.ip_addr, self.sa)
             h.flash(_('created user %s') % usr,
                     category='success')
             Session.commit()
             #action_logger(self.rhodecode_user, 'new_user', '', '', self.sa)
         except formencode.Invalid, errors:
             return htmlfill.render(
                 render('admin/users/user_add.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
@@ @@ -112,12 +115,15 @@ class UsersController(BaseController): @@
         _form = UserForm(edit=True, old_data={'user_id': id,
                                               'email': c.user.email})()
         form_result = {}
         try:
             form_result = _form.to_python(dict(request.POST))
             user_model.update(id, form_result)
             usr = form_result['username']
             action_logger(self.rhodecode_user, 'admin_updated_user:%s' % usr,
                           None, self.ip_addr, self.sa)
             h.flash(_('User updated successfully'), category='success')
             Session.commit()
         except formencode.Invalid, errors:
             e = errors.error_dict or {}
             perm = Permission.get_by_key('hg.create.repository')
             e.update({'create_repo_perm': user_model.has_perm(id, perm)})

rhodecode/controllers/admin/users_groups.py

➞

Show inline comments

@@ @@ -40,12 +40,13 @@ from rhodecode.lib.base import BaseContr @@
 from rhodecode.model.users_group import UsersGroupModel
 from rhodecode.model.db import User, UsersGroup, Permission, UsersGroupToPerm
 from rhodecode.model.forms import UsersGroupForm
 from rhodecode.model.meta import Session
 from rhodecode.lib.utils import action_logger
 log = logging.getLogger(__name__)
 class UsersGroupsController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
@@ @@ -73,15 +74,17 @@ class UsersGroupsController(BaseControll @@
         users_group_form = UsersGroupForm()()
         try:
             form_result = users_group_form.to_python(dict(request.POST))
             UsersGroupModel().create(name=form_result['users_group_name'],
                                      active=form_result['users_group_active'])
             h.flash(_('created users group %s') \
                     % form_result['users_group_name'], category='success')
             #action_logger(self.rhodecode_user, 'new_user', '', '', self.sa)
             gr = form_result['users_group_name']
             action_logger(self.rhodecode_user,
                           'admin_created_users_group:%s' % gr,
                           None, self.ip_addr, self.sa)
             h.flash(_('created users group %s') % gr, category='success')
             Session.commit()
         except formencode.Invalid, errors:
             return htmlfill.render(
                 render('admin/users_groups/users_group_add.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
@@ @@ -122,16 +125,17 @@ class UsersGroupsController(BaseControll @@
                                           old_data=c.users_group.get_dict(),
                                           available_members=available_members)()
         try:
             form_result = users_group_form.to_python(request.POST)
             UsersGroupModel().update(c.users_group, form_result)
             h.flash(_('updated users group %s') \
                         % form_result['users_group_name'],
                     category='success')
             #action_logger(self.rhodecode_user, 'new_user', '', '', self.sa)
             gr = form_result['users_group_name']
             action_logger(self.rhodecode_user,
                           'admin_updated_users_group:%s' % gr,
                           None, self.ip_addr, self.sa)
             h.flash(_('updated users group %s') % gr, category='success')
             Session.commit()
         except formencode.Invalid, errors:
             e = errors.error_dict or {}
             perm = Permission.get_by_key('hg.create.repository')
             e.update({'create_repo_perm':

rhodecode/controllers/changeset.py

➞

Show inline comments

@@ @@ -37,13 +37,13 @@ from rhodecode.lib.vcs.exceptions import @@
     ChangesetDoesNotExistError
 from rhodecode.lib.vcs.nodes import FileNode
 import rhodecode.lib.helpers as h
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import EmptyChangeset
+from rhodecode.lib.utils import EmptyChangeset, action_logger
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib import diffs
 from rhodecode.model.db import ChangesetComment
 from rhodecode.model.comment import ChangesetCommentsModel
 from rhodecode.model.meta import Session
 from rhodecode.lib.diffs import wrapped_diff
@@ @@ -370,13 +370,18 @@ class ChangesetController(BaseRepoContro @@
             repo_id=c.rhodecode_db_repo.repo_id,
             user_id=c.rhodecode_user.user_id,
             revision=revision,
             f_path=request.POST.get('f_path'),
             line_no=request.POST.get('line')
+        )
         action_logger(self.rhodecode_user,
                       'user_commented_revision:%s' % revision,
                       c.rhodecode_db_repo, self.ip_addr, self.sa)
         Session.commit()
         if not request.environ.get('HTTP_X_PARTIAL_XHR'):
             return redirect(h.url('changeset_home', repo_name=repo_name,
                                   revision=revision))
         data = {
            'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),

rhodecode/controllers/journal.py

➞

Show inline comments

@@ @@ -189,13 +189,12 @@ class JournalController(BaseController): @@
                          link=url('public_journal_atom', qualified=True),
                          description=_('Public journal'),
                          language=self.language,
                          ttl=self.ttl)
         for entry in journal[:self.feed_nr]:
             #tmpl = h.action_parser(entry)[0]
             action, action_extra = h.action_parser(entry, feed=True)
             title = "%s - %s %s" % (entry.user.short_contact, action,
                                  entry.repository.repo_name)
             desc = action_extra()
             feed.add_item(title=title,
                           pubdate=entry.action_date,
@@ @@ -223,13 +222,12 @@ class JournalController(BaseController): @@
                          link=url('public_journal_rss', qualified=True),
                          description=_('Public journal'),
                          language=self.language,
                          ttl=self.ttl)
         for entry in journal[:self.feed_nr]:
             #tmpl = h.action_parser(entry)[0]
             action, action_extra = h.action_parser(entry, feed=True)
             title = "%s - %s %s" % (entry.user.short_contact, action,
                                  entry.repository.repo_name)
             desc = action_extra()
             feed.add_item(title=title,
                           pubdate=entry.action_date,

rhodecode/controllers/settings.py

➞

Show inline comments

@@ @@ -101,13 +101,13 @@ class SettingsController(BaseRepoControl @@
             repo_model.update(repo_name, form_result)
             invalidate_cache('get_repo_cached_%s' % repo_name)
             h.flash(_('Repository %s updated successfully' % repo_name),
                     category='success')
             changed_name = form_result['repo_name_full']
             action_logger(self.rhodecode_user, 'user_updated_repo',
-                          changed_name, '', self.sa)
+                          changed_name, self.ip_addr, self.sa)
             Session.commit()
         except formencode.Invalid, errors:
             c.repo_info = repo_model.get_by_repo_name(repo_name)
             c.users_array = repo_model.get_users_js()
             errors.value.update({'user': c.repo_info.user.username})
             return htmlfill.render(
@@ @@ -142,13 +142,13 @@ class SettingsController(BaseRepoControl @@
                       ' in order to rescan repositories') % repo_name,
                       category='error')
             return redirect(url('home'))
         try:
             action_logger(self.rhodecode_user, 'user_deleted_repo',
-                              repo_name, '', self.sa)
+                              repo_name, self.ip_addr, self.sa)
             repo_model.delete(repo)
             invalidate_cache('get_repo_cached_%s' % repo_name)
             h.flash(_('deleted repository %s') % repo_name, category='success')
             Session.commit()
         except Exception:
             log.error(traceback.format_exc())

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -534,28 +534,63 @@ def action_parser(user_log, feed=False): @@
     def get_fork_name():
         repo_name = action_params
         return _('fork name ') + str(link_to(action_params, url('summary_home',
                                           repo_name=repo_name,)))
     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),
            'admin_created_repo': (_('[created] repository'), None),
            'admin_forked_repo': (_('[forked] repository'), None),
            'admin_updated_repo': (_('[updated] repository'), None),
            'push': (_('[pushed] into'), get_cs_links),
            'push_local': (_('[committed via RhodeCode] into'), get_cs_links),
            'push_remote': (_('[pulled from remote] into'), get_cs_links),
            'pull': (_('[pulled] from'), None),
            'started_following_repo': (_('[started following] repository'), None),
            'stopped_following_repo': (_('[stopped following] repository'), None),
+            }
     def get_user_name():
         user_name = action_params
         return user_name
     def get_users_group():
         group_name = action_params
         return group_name
     # action : translated str, callback(extractor), icon
     action_map = {
     'user_deleted_repo':         (_('[deleted] repository'), None,
                                   'database_delete.png'),
     'user_created_repo':         (_('[created] repository'), None,
                                   'database_add.png'),
     'user_created_fork':         (_('[created] repository as fork'), None,
                                   'arrow_divide.png'),
     'user_forked_repo':          (_('[forked] repository'), get_fork_name,
                                   'arrow_divide.png'),
     'user_updated_repo':         (_('[updated] repository'), None,
                                   'database_edit.png'),
     'admin_deleted_repo':        (_('[delete] repository'), None,
                                   'database_delete.png'),
     'admin_created_repo':        (_('[created] repository'), None,
                                   'database_add.png'),
     'admin_forked_repo':         (_('[forked] repository'), None,
                                   'arrow_divide.png'),
     'admin_updated_repo':        (_('[updated] repository'), None,
                                  'database_edit.png'),
     'admin_created_user':        (_('[created] user'), get_user_name,
                                  'user_add.png'),
     'admin_updated_user':        (_('[updated] user'), get_user_name,
                                  'user_edit.png'),
     'admin_created_users_group': (_('[created] users group'), get_users_group,
                                   'group_add.png'),
     'admin_updated_users_group': (_('[updated] users group'), get_users_group,
                                   'group_edit.png'),
     'user_commented_revision':   (_('[commented] on revision'), get_cs_links,
                                   'comment_add.png'),
     'push':                      (_('[pushed] into'), get_cs_links,
                                   'script_add.png'),
     'push_local':                (_('[committed via RhodeCode] into'), get_cs_links,
                                   'script_edit.png'),
     'push_remote':               (_('[pulled from remote] into'), get_cs_links,
                                   'connect.png'),
     'pull':                      (_('[pulled] from'), None,
                                   'down_16.png'),
     'started_following_repo':    (_('[started following] repository'), None,
                                   'heart_add.png'),
     'stopped_following_repo':    (_('[stopped following] repository'), None,
                                   'heart_delete.png'),
+    }
     action_str = action_map.get(action, action)
     if feed:
         action = action_str[0].replace('[', '').replace(']', '')
     else:
         action = action_str[0]\
@@ @@ -564,42 +599,27 @@ def action_parser(user_log, feed=False): @@
     action_params_func = lambda: ""
     if callable(action_str[1]):
         action_params_func = action_str[1]
     return [literal(action), action_params_func]
     def action_parser_icon():
         action = user_log.action
         action_params = None
         x = action.split(':')
 def action_parser_icon(user_log):
     action = user_log.action
     action_params = None
     x = action.split(':')
     if len(x) > 1:
         action, action_params = x
         if len(x) > 1:
             action, action_params = x
     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',
            'admin_created_repo':'database_add.png',
            'admin_forked_repo':'arrow_divide.png',
            'admin_updated_repo':'database_edit.png',
            'push':'script_add.png',
            'push_local':'script_edit.png',
            'push_remote':'connect.png',
            'pull':'down_16.png',
            'started_following_repo':'heart_add.png',
            'stopped_following_repo':'heart_delete.png',
+            }
     return literal(tmpl % ((url('/images/icons/')),
                            map.get(action, action), action))
         tmpl = """<img src="%s%s" alt="%s"/>"""
         ico = action_map.get(action, ['', '', ''])[2]
         return literal(tmpl % ((url('/images/icons/')), ico, action))
     # returned callbacks we need to call to get
     return [lambda: literal(action), action_params_func, action_parser_icon]
 #==============================================================================
 # PERMS
 #==============================================================================
 from rhodecode.lib.auth import HasPermissionAny, HasPermissionAll, \

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -143,19 +143,20 @@ def action_logger(user, action, repo, ip @@
             repo_obj = Repository.get(repo.repo_id)
             repo_name = repo_obj.repo_name
         elif  isinstance(repo, basestring):
             repo_name = repo.lstrip('/')
             repo_obj = Repository.get_by_repo_name(repo_name)
         else:
             raise Exception('You have to provide repository to action logger')
             repo_obj = None
             repo_name = ''
         user_log = UserLog()
         user_log.user_id = user_obj.user_id
         user_log.action = safe_unicode(action)
-        user_log.repository_id = repo_obj.repo_id
+        user_log.repository = repo_obj
         user_log.repository_name = repo_name
         user_log.action_date = datetime.datetime.now()
         user_log.user_ip = ipaddr
         sa.add(user_log)

rhodecode/templates/admin/admin_log.html

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ @@
 		<th class="left">${_('From IP')}</th>
 	</tr>
 	%for cnt,l in enumerate(c.users_log):
 	<tr class="parity${cnt%2}">
 		<td>${h.link_to(l.user.username,h.url('edit_user', id=l.user.user_id))}</td>
 		<td>${h.action_parser(l)[0]}
+		<td>${h.action_parser(l)[0]()}
 		  <div class="journal_action_params">
 		  ${h.literal(h.action_parser(l)[1]())}</div>
 		</td>
 		<td>
 		%if l.repository:
 		  ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))}

rhodecode/templates/journal/journal_data.html

➞

Show inline comments

@@ @@ -8,14 +8,14 @@ @@
 	            <div class="gravatar">
 	                <img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/>
 	            </div>
 	            <div class="journal_user">${user.name} ${user.lastname}</div>
 	            <div class="journal_action_container">
 	            % for entry in entries:
 		            <div class="journal_icon"> ${h.action_parser_icon(entry)}</div>
 		            <div class="journal_action">${h.action_parser(entry)[0]}</div>
 		            <div class="journal_icon"> ${h.action_parser(entry)[2]()}</div>
 		            <div class="journal_action">${h.action_parser(entry)[0]()}</div>
 		            <div class="journal_repo">
 		                <span class="journal_repo_name">
 		                %if entry.repository is not None:
 		                  ${h.link_to(entry.repository.repo_name,
 		                              h.url('summary_home',repo_name=entry.repository.repo_name))}
 		                %else:

0 comments (0 inline, 0 general)