From 6039cf63af132e28755aec5ed10ce6e2fe4cbeb4 Mon Sep 17 00:00:00 2001 From: nwb Date: Fri, 20 Jun 2014 09:08:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA=E5=8C=BA?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=9D=83=E9=99=90=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/user.rb | 3 +++ public/stylesheets/application.css | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index d4e710098..a0861cd27 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -818,6 +818,9 @@ class User < Principal # authorize if user has at least one role that has this permission roles = memberships.collect {|m| m.roles}.flatten.uniq + if roles.count == 0 + roles = coursememberships.collect {|m| m.roles}.flatten.uniq + end roles << (self.logged? ? Role.non_member : Role.anonymous) roles.any? {|role| role.allowed_to?(action) && diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1952334e2..97acb9a70 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -691,6 +691,12 @@ ul.tool li{list-style-type:none; word-break: break-all; } +ul.user_course_sort{margin:0px; padding-left:0em;} +ul.user_course_sort li{list-style-type:none; + height:auto;} + + + .info-break{ word-wrap: break-word; word-break: break-all;