Ignore:
Timestamp:
Nov 4, 2009, 7:14:50 PM (14 years ago)
Author:
LucMorizur
Message:

[Event Cats] Some debugging ; adapt certain labels so that it can be recognized in other modules

(See http://fr.piwigo.org/forum/viewtopic.php?pid=122608#p122608 ) mainly

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/event_cats/admin/template/autolog_new.js

    r4179 r4181  
    2121var ec_default_entry            = '';
    2222var ec_up_code_lbl_forced_txt   = '';
     23var ec_original_old_user        = '';
    2324var ec_selected_old_entry       = '-1';
    2425var ec_selected_old_code        = '-1';
     
    7273      ec_selected_user = 'ec_sel_user_old';
    7374      ec_selected_old_user = ec_lists['user_id'][ec_id];
     75      ec_original_old_user = ec_selected_old_user;
    7476      if (
    7577        ec_lists['arg1'][ec_id] != '' &&
     
    551553  var t1 = true;
    552554  var t2 = true;
     555  var t3 = false;
    553556  if (ec_dont_check) return true;
    554557  if (ec_is_creation) {
     558    t3 = de('ec_sel_code_old').checked != '';
    555559    if ((
    556560      de('ec_sel_code_new').checked != '' &&
     
    588592      return false;
    589593    }
     594    if (
     595      de('ec_sel_user_new').checked != '' || (
     596        de('ec_sel_user_old').checked != '' &&
     597        ec_original_old_user != d.ec_new_code.ec_in_up_usr_list.value
     598      )
     599    ) if (!confirm(ec_JS_message['ec_confirm_change_user'])) return false;
    590600  }
    591601  if ((
     
    629639    return false;
    630640  }
    631   if ((!ec_is_creation && !t1) ||
    632     (de('ec_in_up_forced_id').checked != '' && de('ec_sel_code_old').checked != '')
    633   ) return confirm(ec_JS_message['ec_confirm_del_other']);
     641  if (!ec_is_creation && !t1)
     642   return confirm(ec_JS_message['ec_confirm_del_other']);
     643  else if (
     644    (!ec_is_creation || t3) &&
     645    de('ec_in_up_forced_id').checked != ''
     646  ) return confirm(ec_JS_message['ec_confirm_force']);
    634647  return true;
    635648}
Note: See TracChangeset for help on using the changeset viewer.