[LON-CAPA-cvs] cvs: loncom /interface portfolio.pm

[raeburn]

raeburn		Sat Jan  3 19:28:53 2009 EDT

  Modified files:              
    /loncom/interface	portfolio.pm 
  Log:
  - do not include $brcrum in call to loncommon::start_page() if this is a portfolio for a course group (currently &coursegrp_portfolio_header() provides the breadcrumbs in that case).
  - do not form uertools_access() check if this is a portfolio for a course group (availability in groups is controlled by separate privs).   
  
  
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.204 loncom/interface/portfolio.pm:1.205
--- loncom/interface/portfolio.pm:1.204	Sat Jan  3 19:14:19 2009
+++ loncom/interface/portfolio.pm	Sat Jan  3 19:28:53 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.204 2009/01/03 19:14:19 raeburn Exp $
+# $Id: portfolio.pm,v 1.205 2009/01/03 19:28:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2253,20 +2253,22 @@
     } elsif ($env{'form.action'} eq 'rolepicker') {
         $r->print(&Apache::loncommon::start_page('New role-based condition',undef,
                                                  {'no_nav_bar'  => 1, }));
+    } elsif ($caller eq 'coursegrp_portfolio') {
+        $r->print(&Apache::loncommon::start_page($title));
     } else {
         $r->print(&Apache::loncommon::start_page($title,undef,
                                                  {'bread_crumbs' => $brcrum}));
+        if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) {
+            $r->print('<h2>'.&mt('No user portfolio available') .'</h2>'.
+                      &mt('This is a result of one of the following:').'<ul>'.
+                      '<li>'.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'</li>'.
+                      '<li>'.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'</li>'.
+                      '</ul>');
+            $r->print(&Apache::loncommon::end_page());
+            return OK;
+        }
     }
     $r->rflush();
-    if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) {
-        $r->print('<h2>'.&mt('No user portfolio available') .'</h2>'.
-                  &mt('This is a result of one of the following:').'<ul>'.
-                  '<li>'.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'</li>'.
-                  '<li>'.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'</li>'.
-                  '</ul>');
-         $r->print(&Apache::loncommon::end_page());
-         return OK;
-    }
     my ($blocked,$blocktext) = 
         &Apache::loncommon::blocking_status('port',$uname,$udom);
     if ($blocked) {