From c2d8582d0abda442a2102c5cf06f3223bc395cfb Mon Sep 17 00:00:00 2001
From: Ming Tsay <mt@moztw.org>
Date: Tue, 7 Mar 2017 00:04:57 +0800
Subject: [PATCH] bugfix: namelists don't work in strict_check mode

---
 app/models/ActivityCheck.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/ActivityCheck.php b/app/models/ActivityCheck.php
index bf6e316..86f382d 100644
--- a/app/models/ActivityCheck.php
+++ b/app/models/ActivityCheck.php
@@ -14,9 +14,9 @@ public static function checkData($data){
     }
     
     public static function checkPremission($aid, $student_id = ''){
-        $result = DB::select('select count(name) count from namelist_member join activity where activity.aid = ? and namelist_member.student_id = ?',array($aid, $student_id));
+        $result = DB::select('select activity_type, count(name) count from namelist_member join activity on activity.nid = namelist_member.nid where activity.aid = ? and namelist_member.student_id = ?',array($aid, $student_id));
 
-        if($result[0]->count == 0){
+        if($result[0]->activity_type == 'strict_check' && $result[0]->count == 0){
             return false;
         }else{
             return true;