Gabriel Santiago Plaza před 3 roky
rodič
revize
00e8240450

+ 1
- 1
app/controllers/CriteriaController.php Zobrazit soubor

764
             $objectives = DB::table('objectives')
764
             $objectives = DB::table('objectives')
765
                 ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
765
                 ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
766
                 ->join('programs', 'programs.id', '=', 'objective_program.program_id')
766
                 ->join('programs', 'programs.id', '=', 'objective_program.program_id')
767
-                ->where('program.school_id', Auth::user()->school_id)
767
+                ->where('programs.school_id', Auth::user()->school_id)
768
                 ->where('objectives.active', 1)
768
                 ->where('objectives.active', 1)
769
                 ->orderBy('objectives.text', 'asc')
769
                 ->orderBy('objectives.text', 'asc')
770
                 ->select('objectives.id', 'objectives.text')
770
                 ->select('objectives.id', 'objectives.text')

+ 1
- 1
app/controllers/TemplatesController.php Zobrazit soubor

165
 				$query = DB::table('titles')
165
 				$query = DB::table('titles')
166
 					->where('text', $text)->first();
166
 					->where('text', $text)->first();
167
 				if ($query) {
167
 				if ($query) {
168
-					$result = DB::insert("insert into `template_title` (`template_id`, `title_id` `position`) values ({$templateId}, {$query->id}, {$index})");
168
+					$result = DB::insert("insert into `template_title` (`template_id`, `title_id`, `position`) values ({$templateId}, {$query->id}, {$index})");
169
 					if (!$result) {
169
 					if (!$result) {
170
 						Session::flash('status', 'danger');
170
 						Session::flash('status', 'danger');
171
 						Session::flash('message', 'Rubric could not be created.');
171
 						Session::flash('message', 'Rubric could not be created.');