changeset 1327:603b6bcd180b

merged fix for #188 into default
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 12 May 2011 18:11:01 +0200
parents 0e0fb228867b
children e058df3ff2b4
files rhodecode/model/db.py rhodecode/public/css/style.css
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/model/db.py	Tue Apr 26 19:21:11 2011 +0200
+++ b/rhodecode/model/db.py	Thu May 12 18:11:01 2011 +0200
@@ -2,12 +2,12 @@
 """
     rhodecode.model.db
     ~~~~~~~~~~~~~~~~~~
-    
+
     Database Models for RhodeCode
     
     :created_on: Apr 08, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -80,6 +80,7 @@
 
     repositories = relationship('Repository')
     user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all')
+    repo_to_perm = relationship('RepoToPerm', primaryjoin='RepoToPerm.user_id==User.user_id', cascade='all')
 
     @property
     def full_contact(self):
--- a/rhodecode/public/css/style.css	Tue Apr 26 19:21:11 2011 +0200
+++ b/rhodecode/public/css/style.css	Thu May 12 18:11:01 2011 +0200
@@ -2014,7 +2014,7 @@
 
 .action_button {
 border:0;
-display:block;
+display:inline;
 }
 
 .action_button:hover {