diff options
| -rwxr-xr-x | manage_proposal.inc | 9 | ||||
| -rwxr-xr-x | textbook_companion.module | 7 |
2 files changed, 12 insertions, 4 deletions
diff --git a/manage_proposal.inc b/manage_proposal.inc index c68d227..a6dbb12 100755 --- a/manage_proposal.inc +++ b/manage_proposal.inc @@ -263,6 +263,13 @@ function proposal_approval_form_submit($form, &$form_state) db_query("UPDATE {textbook_companion_proposal} SET approver_uid = %d, approval_date = %d, proposal_status = 2, message = '%s' WHERE id = %d", $user->uid, time(), $form_state['values']['message'], $proposal_id); db_query("UPDATE {textbook_companion_preference} SET approval_status = 2 WHERE proposal_id = %d", $proposal_id); + /* unlock all the aicte books */ + $query = " + UPDATE textbook_companion_aicte + SET status = 0, uid = 0, proposal_id = 0, preference_id = 0 + WHERE proposal_id = {$proposal_id} + "; + db_query($query); /* sending email */ $book_user = user_load($row->uid); $param['proposal_disapproved']['proposal_id'] = $proposal_id; @@ -285,7 +292,7 @@ function proposal_approval_form_submit($form, &$form_state) $query = " UPDATE textbook_companion_aicte SET status = 0, uid = 0, proposal_id = 0, preference_id = 0 - WHERE proposal_id = {$proposal_id} AND preference_id = {$preference_id} + WHERE proposal_id = {$proposal_id} AND preference_id != {$preference_id} "; db_query($query); diff --git a/textbook_companion.module b/textbook_companion.module index 09e4499..da660d8 100755 --- a/textbook_companion.module +++ b/textbook_companion.module @@ -666,6 +666,7 @@ function textbook_companion_proposal_all() { function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL) { + global $user; $form = array(); $form['imp_notice'] = array( '#type' => 'item', @@ -829,7 +830,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL) '#size' => 30, '#maxlength' => 25, '#required' => TRUE, - '#value' => $row1->isbn, + '#default_value' => $row1->isbn, '#disabled' => ($row1->isbn?TRUE:FALSE), ); $form['preference1']['publisher1'] = array( @@ -889,7 +890,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL) '#size' => 30, '#maxlength' => 25, '#required' => TRUE, - '#value' => $row2->isbn, + '#default_value' => $row2->isbn, '#disabled' => ($row2->isbn?TRUE:FALSE), ); $form['preference2']['publisher2'] = array( @@ -949,7 +950,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL) '#size' => 30, '#maxlength' => 25, '#required' => TRUE, - '#value' => $row3->isbn, + '#default_value' => $row3->isbn, '#disabled' => ($row3->isbn?TRUE:FALSE), ); $form['preference3']['publisher3'] = array( |