Removed refrences to next_doenetId

jaltekruse · Mar 26, 2023 · 5347709 · 5347709
1 parent eade9eb
commit 5347709
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 65 deletions.
diff --git a/src/Api/getNextDoenetId.php b/src/Api/getNextDoenetId.php
diff --git a/src/Api/getPortfolioActivityData.php b/src/Api/getPortfolioActivityData.php
@@ -6,6 +6,7 @@
 header('Content-Type: application/json');
 
 include 'db_connection.php';
+include 'permissionsAndSettingsForOneCourseFunction.php';
 
 $jwtArray = include 'jwtArray.php';
 $userId = $jwtArray['userId'];
@@ -43,6 +44,39 @@
     'pageDoenetId' => $pageDoenetId,
 ];
 
+$courseId = '';
+
+//What is the courseId of the doenetId
+if ($success) {
+    $sql = "
+    SELECT courseId 
+    FROM course_content 
+    WHERE doenetId = '$doenetId'
+    ";
+    $result = $conn->query($sql);
+
+    if ($result->num_rows > 0) {
+        $row = $result->fetch_assoc();
+        $courseId = $row['courseId'];
+    } else {
+        $success = false;
+        $message = "Sorry! The activity doesn't have an associated portfolio.";
+    }
+}
+
+//Test if they have the permission to edit it
+if ($success) {
+    $permissions = permissionsAndSettingsForOneCourseFunction(
+        $conn,
+        $userId,
+        $courseId
+    );
+    if ($permissions['canModifyActivitySettings'] == '0') {
+        $success = false;
+        $message = 'You need permission to edita a portfolio activity.';
+    }
+}
+
 //Assume we are updating the activity and need the current settings
 if ($success) {
     $sql = "
@@ -68,21 +102,9 @@
             'pageDoenetId' => $pageDoenetId,
         ];
     } else {
-        //It's a new activity or a hack
-        //So test if it's a hack
-        $sql = "
-        SELECT doenetId 
-        FROM next_doenetId
-        WHERE userId='$userId'
-        AND doenetId='$doenetId'
-        ";
-        $result = $conn->query($sql);
-        if ($result->num_rows <= 0) {
-            //It's a Hack
-            $success = false;
-            $message =
-                'Error: You need to click add activity before navigating here';
-        }
+        $success = false;
+        $message =
+            'Error: You need to click add activity before navigating here';
     }
 }
 

diff --git a/src/Tools/_framework/Paths/Portfolio.jsx b/src/Tools/_framework/Paths/Portfolio.jsx
@@ -25,7 +25,7 @@ export async function action({request}) {
     let response = await fetch(`/api/deletePortfolioActivity.php?doenetId=${formObj.doenetId}`);
 
         if (response.ok) {
-          let respObj = await response.json();
+          // let respObj = await response.json();
           return true;
         }else{
           throw Error(response.message)
@@ -34,7 +34,7 @@ export async function action({request}) {
     let response = await fetch(`/api/updateIsPublicActivity.php?doenetId=${formObj.doenetId}&isPublic=1`);
 
         if (response.ok) {
-          let respObj = await response.json();
+          // let respObj = await response.json();
           return true;
         }else{
           throw Error(response.message)
@@ -43,7 +43,7 @@ export async function action({request}) {
     let response = await fetch(`/api/updateIsPublicActivity.php?doenetId=${formObj.doenetId}&isPublic=0`);
 
         if (response.ok) {
-          let respObj = await response.json();
+          // let respObj = await response.json();
           return true;
         }else{
           throw Error(response.message)