Fixing regression computing required videos.

After refactoring users were required to watch all videos regardless of
their assessment score.

Also enabling strict video ordering and adding the option magicskip to
watch out of order.

2 files changed, 4 insertions, 2 deletions

diff --git a/src/com/p4square/grow/frontend/ChapterCompletePage.java b/src/com/p4square/grow/frontend/ChapterCompletePage.java
index b0bfdd7..e8d5ca4 100644
--- a/src/com/p4square/grow/frontend/ChapterCompletePage.java
+++ b/src/com/p4square/grow/frontend/ChapterCompletePage.java
@@ -158,8 +158,10 @@ public class ChapterCompletePage extends FreeMarkerPageResource {
             return 3;
         } else if ("believer".equals(chapter)) {
             return 2;
-        } else {
+        } else if ("seeker".equals(chapter)) {
             return 1;
+        } else {
+            return Integer.MAX_VALUE;
         }
     }
 }
diff --git a/src/com/p4square/grow/frontend/TrainingPageResource.java b/src/com/p4square/grow/frontend/TrainingPageResource.java
index dc40500..f2a0938 100644
--- a/src/com/p4square/grow/frontend/TrainingPageResource.java
+++ b/src/com/p4square/grow/frontend/TrainingPageResource.java
@@ -119,7 +119,7 @@ public class TrainingPageResource extends FreeMarkerPageResource {
             // The user is not allowed to view chapters after his highest completed chapter.
             // In this loop we find which chapters are allowed and check if the user tried
             // to skip ahead.
-            boolean allowUserToSkip = mConfig.getBoolean("allowUserToSkip", true);
+            boolean allowUserToSkip = mConfig.getBoolean("allowUserToSkip", false) || getQueryValue("magicskip") != null;
             String defaultChapter = null;
             boolean userTriedToSkip = false;
             int overallProgress = 0;