Merge branch 'master' into kimth/mark-graded

common/djangoapps/student/views.py

@@ -131,10 +131,14 @@ def dashboard(request):
         staff_access = True
         errored_courses = modulestore().get_errored_courses()
 
+    show_courseware_links_for = frozenset(course.id for course in courses
+                                          if has_access(request.user, course, 'load'))
+
     context = {'courses': courses,
                'message': message,
                'staff_access': staff_access,
-               'errored_courses': errored_courses,}
+               'errored_courses': errored_courses,
+               'show_courseware_links_for' : show_courseware_links_for}
 
     return render_to_response('dashboard.html', context)
 

lms/djangoapps/courseware/views.py

@@ -264,7 +264,11 @@ def registered_for_course(course, user):
 def course_about(request, course_id):
     course = get_course_with_access(request.user, course_id, 'see_exists')
     registered = registered_for_course(course, request.user)
-    return render_to_response('portal/course_about.html', {'course': course, 'registered': registered})
+    show_courseware_link = has_access(request.user, course, 'load')
+    return render_to_response('portal/course_about.html',
+                              {'course': course,
+                               'registered': registered, 
+                               'show_courseware_link' : show_courseware_link})
 
 
 @ensure_csrf_cookie

lms/templates/dashboard.html

@@ -87,7 +87,9 @@
               <section class="course-status">
                 <p>Class Starts - <span>${course.start_date_text}</span></p>
               </section>
-              <p class="enter-course">View Courseware</p>
+              % if course.id in show_courseware_links_for:
+                <p class="enter-course">View Courseware</p>
+              % endif
             </section>
           </a>
         </article>

lms/templates/portal/course_about.html

@@ -74,7 +74,10 @@
 	        %if show_link:
                 <a href="${course_target}">
                 %endif
-                <span class="register disabled">You are registered for this course (${course.number})</span> <strong>View Courseware</strong>
+                <span class="register disabled">You are registered for this course (${course.number})</span>
+                % if show_courseware_link:
+                  <strong>View Courseware</strong>
+                % endif
 	        %if show_link:
                 </a>
                 %endif