Adding validation and Career Updated message -refs #6316

main/admin/careers.php

@@ -117,12 +117,16 @@ switch ($action) {
         if ($form->validate()) {            
             if ($check) {
                 $values = $form->exportValues();
-                $career->update_all_promotion_status_by_career_id($values['id'],$values['status']);               
+                $career->update_all_promotion_status_by_career_id($values['id'],$values['status']);
+                $old_status = $career->get_status($values['id']);               
                 $res    = $career->update($values);
-                if ($values['status']) {
+                if ($res) {
-                    Display::display_confirmation_message(sprintf(get_lang('CareerXUnarchived'), $values['name']), false);
+                    Display::display_confirmation_message(get_lang('CareerUpdated'));
-                } else {
+                    if ($values['status'] && !$old_status) {
-                    Display::display_confirmation_message(sprintf(get_lang('CareerXArchived'), $values['name']), false);
+                        Display::display_confirmation_message(sprintf(get_lang('CareerXUnarchived'), $values['name']), false);
+                    } elseif (!$values['status'] && $old_status) {
+                        Display::display_confirmation_message(sprintf(get_lang('CareerXArchived'), $values['name']), false);
+                    }
                 }
             }            
             $career->display();

main/admin/promotions.php

@@ -130,11 +130,9 @@ switch ($action) {
             if ($check) {
                 $values = $form->exportValues();                    
                 $res    = $promotion->update($values);
-                $promotion->update_all_sessions_status_by_promotion_id($values['id'], $values['status']);    
+                $promotion->update_all_sessions_status_by_promotion_id($values['id'], $values['status']);  
-                if ($values['status']) {
+                if ($res) {
-                    Display::display_confirmation_message(sprintf(get_lang('PromotionXUnarchived'), $values['name']), false);
+                    Display::display_confirmation_message(get_lang('PromotionUpdated'), $values['name']);
-                } else {
-                    Display::display_confirmation_message(sprintf(get_lang('PromotionXArchived'), $values['name']), false);
                 }
             }            
             $promotion->display();

main/inc/lib/career.lib.php

@@ -171,7 +171,21 @@ class Career extends Model {
         return $cid;
     }    
     
-    public function save($params) {
+     public function get_status($carrer_id) {
+        $TBL_CAREER             = Database::get_main_table(TABLE_CAREER);
+        $sql 	= "SELECT status FROM $TBL_CAREER WHERE id = '$carrer_id'";
+        $result = Database::query($sql);
+        if (Database::num_rows($result) > 0) {
+            $data = Database::fetch_array($result);
+            return $data['status'];
+        } else {
+            return false;
+        }
+        
+    }
+        
+    
+    public function save($params, $show_query = false) {
 	    $id = parent::save($params);
 	    if (!empty($id)) {
 	    	event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());