Merge pull request #818 from uw-it-aca/hotfix/MUWM-3897

Hotfix/muwm 3897
uw-it-aca · Jul 31, 2017 · 02b20fb · 02b20fb
2 parents f663d78 + 6fe4a20
commit 02b20fb
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 16 deletions.
diff --git a/myuw/dao/instructor_schedule.py b/myuw/dao/instructor_schedule.py
@@ -22,7 +22,9 @@
 logger = logging.getLogger(__name__)
 
 
-def _get_instructor_sections(person, term, future_terms=0):
+def _get_instructor_sections(person, term,
+                             future_terms=0,
+                             include_secondaries=True):
     """
     @return a uw_sws.models.ClassSchedule object
     Return the actively enrolled sections for the current user
@@ -31,7 +33,10 @@ def _get_instructor_sections(person, term, future_terms=0):
     if person is None or term is None:
         return None
     return get_sections_by_instructor_and_term(
-        person, term, future_terms=future_terms,
+        person,
+        term,
+        future_terms=future_terms,
+        include_secondaries=include_secondaries,
         transcriptable_course='all')
 
 
@@ -164,7 +169,10 @@ def is_instructor(request):
             return True
 
         person = get_person_of_current_user()
-        sections = _get_instructor_sections(person, term, future_terms=2)
+        sections = _get_instructor_sections(person,
+                                            term,
+                                            future_terms=2,
+                                            include_secondaries=False)
         if len(sections) > 0:
             add_seen_instructor(user_netid, term)
             return True

diff --git a/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all b/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all
diff --git a/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all b/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all
diff --git a/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all b/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all
diff --git a/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all b/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all
diff --git a/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all b/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all
diff --git a/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all b/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all
diff --git a/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all b/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all
diff --git a/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all b/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all
diff --git a/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all b/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all
diff --git a/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all b/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all
@@ -34,18 +34,6 @@
   "SectionID":"A",
   "Year":"2013"},
  {"Href":"\/student\/v5\/course\/2013,spring,PHYS,121\/A.json",
-  "CourseNumber":"121",
-  "CurriculumAbbreviation":"PHYS",
-  "Quarter":"spring",
-  "SectionID":"A",
-  "Year":"2013"},
- {"Href":"\/student\/v5\/course\/2013,spring,PHYS,121\/AC.json",
-  "CourseNumber":"121",
-  "CurriculumAbbreviation":"PHYS",
-  "Quarter":"spring",
-  "SectionID":"A",
-  "Year":"2013"},
- {"Href":"\/student\/v5\/course\/2013,spring,PHYS,121\/AQ.json",
   "CourseNumber":"121",
   "CurriculumAbbreviation":"PHYS",
   "Quarter":"spring",

diff --git a/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all b/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all
diff --git a/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all b/..._future_terms_2_transcriptable_course_all → ..._future_terms_2_transcriptable_course_all
diff --git a/myuw/test/dao/instructor_schedule.py b/myuw/test/dao/instructor_schedule.py
@@ -19,6 +19,9 @@ def test_is_instructor(self):
         get_request_with_user('bill', now_request)
         self.assertTrue(is_instructor(now_request))
 
+        get_request_with_user('billpce', now_request)
+        self.assertTrue(is_instructor(now_request))
+
     def test_get_current_quarter_instructor_schedule(self):
         now_request = get_request()
         get_request_with_user('bill', now_request)

diff --git a/setup.py b/setup.py
@@ -34,7 +34,7 @@
         'unittest2',
         'AuthZ-Group',
         'python-binary-memcached',
-        'UW-RestClients-SWS<2.0,>=1.3',
+        'UW-RestClients-SWS<2.0,>=1.4',
         'UW-RestClients-PWS<1.0',
         'UW-RestClients-HFS<1.0',
         'UW-RestClients-GWS<1.0',