Quellcode durchsuchen

Merge pull request #89 from ycastillo/yoselyn.6316

Adding validation and Career Updated message -refs #6316
Yannick Warnier vor 11 Jahren
Ursprung
Commit
70cb8e5e98
4 geänderte Dateien mit 31 neuen und 14 gelöschten Zeilen
  1. 9 5
      main/admin/careers.php
  2. 3 5
      main/admin/promotions.php
  3. 17 2
      main/inc/lib/career.lib.php
  4. 2 2
      main/inc/lib/promotion.lib.php

+ 9 - 5
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']) {
-                    Display::display_confirmation_message(sprintf(get_lang('CareerXUnarchived'), $values['name']), false);
-                } else {
-                    Display::display_confirmation_message(sprintf(get_lang('CareerXArchived'), $values['name']), false);
+                if ($res) {
+                    Display::display_confirmation_message(get_lang('CareerUpdated'));
+                    if ($values['status'] && !$old_status) {
+                        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();

+ 3 - 5
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']);    
-                if ($values['status']) {
-                    Display::display_confirmation_message(sprintf(get_lang('PromotionXUnarchived'), $values['name']), false);
-                } else {
-                    Display::display_confirmation_message(sprintf(get_lang('PromotionXArchived'), $values['name']), false);
+                $promotion->update_all_sessions_status_by_promotion_id($values['id'], $values['status']);  
+                if ($res) {
+                    Display::display_confirmation_message(get_lang('PromotionUpdated'), $values['name']);
                 }
             }            
             $promotion->display();

+ 17 - 2
main/inc/lib/career.lib.php

@@ -145,7 +145,7 @@ class Career extends Model {
                 case 'updated_at':
                     break;
                 case 'name':
-                    $val .= ' '.get_lang('Copy');
+                    $val .= ' '.get_lang('CopyLabelSuffix');
                     $new[$key] = $val;
                     break;
                 case 'created_at':
@@ -171,7 +171,22 @@ class Career extends Model {
         return $cid;
     }    
     
-    public function save($params) {
+     public function get_status($career_id) {
+        $TBL_CAREER             = Database::get_main_table(TABLE_CAREER);
+        $career_id = intval($career_id);
+        $sql 	= "SELECT status FROM $TBL_CAREER WHERE id = '$career_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());

+ 2 - 2
main/inc/lib/promotion.lib.php

@@ -53,7 +53,7 @@ class Promotion extends Model {
 					case 'updated_at':
 						break;
 					case 'name':
-						$val .= ' '.get_lang('Copy');
+						$val .= ' '.get_lang('CopyLabelSuffix');
 						$new[$key] = $val;
 						break;
 					case 'created_at':
@@ -143,7 +143,7 @@ class Promotion extends Model {
         }
     }
     
-        
+   
     /**
      * Returns a Form validator Obj
      * @todo the form should be auto generated