SlatePermutate Changeset - 7ce1a5a69798 · protofusion repositories

Changeset - 7ce1a5a69798

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Nathan Brink (binki) - 14 years ago 2011-04-18 23:54:52
ohnobinki@ohnopublishing.net

Sync the `Registration Codes' dialogue with a saved_schedule's specified school/semester. Previously it relied on the session variable for this information.

2 files changed with 15 insertions and 8 deletions:

ajax.php

scripts/displayTables.js

0 comments (0 inline, 0 general)

ajax.php

➞

Show inline comments

@@ @@ -64,20 +64,21 @@ function slate_permutate_json_success(ar @@
   echo json_encode(array('success' => TRUE, 'data' => $data));
   exit;
+}
 if (isset($_REQUEST['school_registration_html']))
+  {
     if (!empty($_REQUEST['school']))
       $school = school_load($_REQUEST['school']);
     /*
      * Since we're just an AJAX callback, ask school_load_guess() not
      * to update $_SESSION with the school the user is using... And
      * make sure that the frontend actually tells us what school the
      * user is using ;-).
      */
     $school = school_load_guess(FALSE);
     if (empty($school))
+      {
 	$school = school_load_guess();
 	if (empty($school))
 	  slate_permutate_json_error('Unable to load any school.');
+      }
       slate_permutate_json_error('Unable to load any school.');
     $page = page::page_create('');
     $courses = array();
     if (!empty($_REQUEST['courses']) && is_array($_REQUEST['courses']))
+      {

scripts/displayTables.js

➞

Show inline comments

@@ @@ -46,13 +46,14 @@ function show_box_change() @@
  *   Do an AJAX loading of data with arbitrary error handling.
+ *
  * \param target
  *   The jQuery object which should be populated with an error message
  *   or the result of loading.
  * \param data
  *   The data to send as a request.
  *   The data to send as a request. The school and semester keys shall
  *   automatically be set.
  * \param handler
  *   A function with the signature handler(target, data) which is called upon
  *   a successful response. There is a default handler which uses
  *   .html() to load the data.data.html into target.
  * \param error_handler
  *   A function with the signature handler(target, status_text, data)
@@ @@ -67,12 +68,17 @@ function slate_permutate_load(target, da @@
     if (jQuery.type(handler) == 'undefined')
 	handler = function(target, data)
+	    {
 		target.html(data.html);
+	    }
     if (!data.school)
 	data.school = slate_permutate_school;
     if (!data.semester)
 	data.semester = slate_permutate_semester;
     if (jQuery.type(error_handler) == 'undefined')
 	error_handler = function(target, status_text, data)
+	    {
 		if (data)
 		    if (data.message)
 			target.html(data.message);

0 comments (0 inline, 0 general)