Temporary Update: trial for ethical ads

Author: bnmnetp

bookserver/models.py

@@ -745,7 +745,9 @@ class Library(Base, IdMixin):
     description = Column(Text)
     authors = Column(Text)
     shelf_section = Column(String(512))
-    basecourse = Column(String(512), ForeignKey("courses.course_name"))
+    basecourse = Column(
+        String(512), ForeignKey("courses.course_name"), nullable=True, unique=True
+    )
     build_system = Column(String(20))
     for_classes = Column(Web2PyBoolean)
     is_visible = Column(Web2PyBoolean, default="T")

bookserver/routers/books.py

@@ -304,6 +304,11 @@ async def serve_page(
         show_rs_banner = False
     rslogger.debug(f"After user check rs_banner is {show_rs_banner}")
 
+    # temporary
+    if course_row.base_course == "thinkcspy":
+        serve_google_ad = False
+    else:
+        serve_google_ad = serve_ad
     context = dict(
         request=request,
         course_name=course_name,
@@ -318,7 +323,7 @@ async def serve_page(
         settings=settings,
         is_logged_in=logged_in,
         subchapter_list=subchapter_list,
-        serve_ad=serve_ad,
+        serve_ad=serve_google_ad,
         is_instructor="true" if user_is_instructor else "false",
         use_services="true" if use_services else "false",
         readings=reading_list,

pyproject.toml

@@ -10,7 +10,7 @@
 # ================
 [tool.poetry]
 name = "bookserver"
-version = "1.3.4"
+version = "1.3.5"
 description = "A new Runestone Server Framework"
 authors = ["Brad Miller <[email protected]>", "Bryan A. Jones <bjones AT ece DOT msstate DOT edu"]
 license = "MIT"