浏览代码

Solo rubricas del programa o escuela en rubric builder

父节点
当前提交
ae33bcfa4f

+ 2
- 1
.gitignore 查看文件

12
 app/config/database.php
12
 app/config/database.php
13
 app/config/app.php
13
 app/config/app.php
14
 app/config/*
14
 app/config/*
15
-
15
+app/storage/annual_pdfs/*
16
+public/exports/*
16
 
17
 
17
 node_modules/
18
 node_modules/
18
 vendor/*
19
 vendor/*

+ 2
- 2
app/controllers/Objective2Controller.php 查看文件

50
 	{
50
 	{
51
 		/** Validation rules */
51
 		/** Validation rules */
52
 
52
 
53
-		if (!$edit) {
53
+		if ($edit) {
54
 			return Validator::make(
54
 			return Validator::make(
55
 				array(
55
 				array(
56
 					'text' => $clean_input['text'],
56
 					'text' => $clean_input['text'],
620
 	{
620
 	{
621
 		//
621
 		//
622
 	}
622
 	}
623
-}
623
+}

+ 1
- 1
app/controllers/TemplatesController.php 查看文件

248
 			// 			var_dump(json_encode($templates_dentro));
248
 			// 			var_dump(json_encode($templates_dentro));
249
 // 		}
249
 // 		}
250
 
250
 
251
-
251
+	$templates_fuera=array();
252
 		return View::make('local.managers.shared.rubrics_new', compact('title', 'templates_dentro', 'templates_fuera', 'outcomes', 'criteria', 'schools', 'programs', 'criteria_ids'));
252
 		return View::make('local.managers.shared.rubrics_new', compact('title', 'templates_dentro', 'templates_fuera', 'outcomes', 'criteria', 'schools', 'programs', 'criteria_ids'));
253
 	}
253
 	}
254
 
254
 

+ 2
- 0
app/views/local/managers/shared/rubrics_new.blade.php 查看文件

115
 
115
 
116
                             @endforeach
116
                             @endforeach
117
                         </select>
117
                         </select>
118
+<!-- 
118
 					<span style="color: red;">Rubrics with "##" at the beginning contain criteria that are not associated with your program or school. You will not be able to use them until your criteria is matched with your program or school.
119
 					<span style="color: red;">Rubrics with "##" at the beginning contain criteria that are not associated with your program or school. You will not be able to use them until your criteria is matched with your program or school.
119
                     </span>
120
                     </span>
121
+ -->
120
 					</div>
122
 					</div>
121
 
123
 
122
                     <!-- If user is admin s/he can pick which schools can view the rubric -->
124
                     <!-- If user is admin s/he can pick which schools can view the rubric -->