--- loncom/interface/slotrequest.pm	2015/09/23 20:09:07	1.125
+++ loncom/interface/slotrequest.pm	2015/09/23 23:04:53	1.126
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for requesting to have slots added to a students record
 #
-# $Id: slotrequest.pm,v 1.125 2015/09/23 20:09:07 raeburn Exp $
+# $Id: slotrequest.pm,v 1.126 2015/09/23 23:04:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1000,10 +1000,21 @@ sub allowed_slot {
     return 0 if (!$userallowed);
 
     # not allowed for this resource
-    if (defined($slot->{'symb'})
-	&& $slot->{'symb'} ne $symb) {
-        unless ((ref($toskip) eq 'HASH') && ($toskip->{'symb'})) {
-	    return 0;
+    if (defined($slot->{'symb'})) {
+        my $exclude = 1;
+        my ($slotmap,$slotid,$sloturl) = &Apache::lonnet::decode_symb($slot->{'symb'});
+        if ($sloturl=~/\.(page|sequence)$/) {
+            my ($map,$id,$url) = &Apache::lonnet::decode_symb($symb);
+            if (($map ne '') && ($map eq $slotmap)) {
+                $exclude = 0;
+            }
+        } elsif ($slot->{'symb'} eq $symb) {
+            $exclude = 0;
+        }
+        if ($exclude) {
+            unless ((ref($toskip) eq 'HASH') && ($toskip->{'symb'})) {
+	        return 0;
+            }
         }
     }
 
@@ -1349,7 +1360,7 @@ sub show_table {
 	     'secret'          => 'Secret Word',
 	     'space'           => '# of students/max',
 	     'ip'              => 'IP or DNS restrictions',
-	     'symb'            => 'Resource slot is restricted to.',
+	     'symb'            => 'Resource/Map slot is restricted to.',
 	     'allowedsections' => 'Sections slot is restricted to.',
 	     'allowedusers'    => 'Users slot is restricted to.',
 	     'uniqueperiod'    => 'Period of time slot is unique',
@@ -2672,7 +2683,7 @@ sub csvupload_fields {
 	    ['proctor','List of proctor ids'],
 	    ['description','Slot Description'],
 	    ['maxspace','Maximum number of reservations'],
-	    ['symb','Resource Restriction'],
+	    ['symb','Resource/Map Restriction'],
 	    ['uniqueperiod','Date range of slot exclusion'],
 	    ['secret','Secret word proctor uses to validate'],
 	    ['allowedsections','Sections slot is restricted to'],