Changeset 4171 for extensions/event_cats/admin

Timestamp:

Nov 2, 2009, 2:23:52 AM (14 years ago)

Author:

LucMorizur

Message:

[Event Cats] Bug corrections

Location:

extensions/event_cats/admin

Files:

• autolog_new.inc.php (modified) (1 diff)
• evntcats_admin.php (modified) (2 diffs)
• template/autolog_entries.js (modified) (2 diffs)
• template/autolog_entries.tpl (modified) (1 diff)
• template/autolog_new.js (modified) (10 diffs)
• template/autolog_new.tpl (modified) (1 diff)

extensions/event_cats/admin/autolog_new.inc.php

@@ -110 +110 @@
 $template->assign('ec_ap_ok',               $ec_ap_ok);
 $template->assign('ec_lists',               $ec_lists);
+$template->assign('cat_display',            (read_ec_conf('cat_display') == '0'));
 $template->assign('ec_default_entry',       $ec_default_entry);
 $template->assign('ec_default_action',      $ec_default_action);

extensions/event_cats/admin/evntcats_admin.php

@@ -38 +38 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-global $template, $conf, $lang, $test1, $prefixeTable, $ec_err, $page,
+global $template, $conf, $lang, $test1, $prefixeTable, $ec_conf, $page,
  $ec_lists,   // array of following arrays :
               //   $ec_lists['ec_table'] :
@@ -188 +188 @@
   'POST'      => str_from_var($_POST),
   'page'      => str_from_var($page),
+  'ec_conf'   => str_from_var($ec_conf),
   'ec_lists'  => (isset($ec_lists)) ? str_from_var($ec_lists) : '(unset)',
   'code_list' => (isset($code_list)) ? str_from_var($code_list) : '(unset)',

extensions/event_cats/admin/template/autolog_entries.js

@@ -28 +28 @@
 
 function ec_check_ds(ec_id) {
+  var t = true;
   ec_mark_line(ec_id);
-  document.getElementById('ec_act1_id').value = 'disable';
-  document.forms['ec_view_codes'].submit();
+  if (!ec_ap_ok) t = confirm(ec_JS_message['ec_confirm_disable']);
+  if (t) {
+    document.getElementById('ec_act1_id').value = 'disable';
+    document.forms['ec_view_codes'].submit();
+  }
 }
 
@@ -56 +60 @@
     return false;
   }
-  else return true;
+  else return confirm(ec_JS_message['ec_confirm_test']);
 }
 

extensions/event_cats/admin/template/autolog_entries.tpl

@@ -124 +124 @@
 <script type = "text/javascript"><!--
   ec_JS_message['ec_confirm_delete']  = "{'ec_confirm_delete'|@translate|@escape:javascript}";
+  ec_JS_message['ec_confirm_disable'] = "{'ec_confirm_disable'|@translate|@escape:javascript}";
   ec_JS_message['ec_confirm_test']    = "{'ec_confirm_test'|@translate|@escape:javascript}";
   ec_JS_message['ec_confirm_force']   = "{'ec_confirm_force'|@translate|@escape:javascript}";

extensions/event_cats/admin/template/autolog_new.js

@@ -7 +7 @@
 var ec_flag1                    = false;
 var ec_flag2                    = false;
+var cat_display                 = false;
 var ec_dont_check               = false;
 var ec_selected_old_group       = false;
@@ -62 +63 @@
 function ec_mark_entry(ec_id) {
   var i = 0;
+  ec_chk_nover_cat = false;
   if (ec_id == '-1') de('ec_in_up_entry_list_id').selectedIndex = '-1';
   else {
@@ -87 +89 @@
         case 2: // Additionnal Page
           ec_selected_action = 'ec_input_action_add_p';
-          ec_selected_cat = (ec_check_exist_value('ec_in_up_aps_id',
+          ec_selected_AP = (ec_check_exist_value('ec_in_up_aps_id',
            ec_lists['arg2'][ec_id])) ? ec_lists['arg2'][ec_id] : '-1';
         break;
@@ -113 +115 @@
     }
   }
+  ec_chk_nover_cat = true;
 }
 
@@ -267 +270 @@
       switch (ec_selected_action) {
         case 'ec_input_action_add_p': // Additional Page
-          de('ec_in_up_aps_id').value = ec_selected_AP;
+          if (ec_selected_AP == '-1')
+           de('ec_in_up_aps_id').selectedIndex = '-1';
+          else
+           de('ec_in_up_aps_id').value = ec_selected_AP;
           de('ec_in_up_cats_id').selectedIndex = '-1';
           de('ec_in_up_imgs_id').value = '';
@@ -274 +280 @@
         case 'ec_input_action_cat': // Category
           de('ec_in_up_aps_id').selectedIndex = '-1';
-          de('ec_in_up_cats_id').value = ec_selected_cat;
+          if (ec_selected_cat == '-1')
+           de('ec_in_up_cats_id').selectedIndex = '-1';
+          else
+           de('ec_in_up_cats_id').value = ec_selected_cat;
           de('ec_in_up_imgs_id').value = '';
           ec_selected_user = (ec_selected_user == 'ec_sel_user_none') ?
@@ -282 +291 @@
         case 'ec_input_action_img': // Image
           de('ec_in_up_aps_id').selectedIndex = '-1';
-          de('ec_in_up_cats_id').value = ec_selected_cat;
-          de('ec_in_up_imgs_id').value = ec_selected_img;
+          if (ec_selected_img == '-1') {
+            de('ec_in_up_cats_id').selectedIndex = '-1';
+            de('ec_in_up_imgs_id').value = '';
+          }
+          else {
+            de('ec_in_up_cats_id').value = ec_selected_cat;
+            de('ec_in_up_imgs_id').value = ec_selected_img;
+          }
           ec_selected_user = (ec_selected_user == 'ec_sel_user_none') ?
            'ec_sel_user_old' : ec_selected_user;
@@ -394 +409 @@
   var ec_reg_ap   = /^\S+/;
   var ec_reg_cat1 = /\/\s(.+)$/;
+  var ec_reg_cat3 = /^\s*\-\s(.+)$/;
   if (
    ec_selected_action == '' ||
@@ -420 +436 @@
             d.ec_new_code.ec_in_up_aps.selectedIndex
            ].label
-          );
+          )[0];
+          ec_new_user_text = ec_new_user_text.substr(0, 32);
           t2 = ec_new_user_text;
         break;
@@ -428 +445 @@
             d.ec_new_code.ec_in_up_cat.selectedIndex
            ].label;
-          ec_new_user_text = (ec_reg_cat2.test(ec_cat_sel)) ?
-           ec_reg_cat1.exec(ec_cat_sel)[1] : ec_cat_sel;
-          ec_new_user_text = ec_new_user_text.replace(/\s/, '_');
+          if (cat_display) ec_new_user_text =
+           (ec_reg_cat2.test(ec_cat_sel)) ?
+            ec_reg_cat1.exec(ec_cat_sel)[1] : ec_cat_sel;
+          else ec_new_user_text = ec_reg_cat3.exec(ec_cat_sel)[1];
+          ec_new_user_text = ec_new_user_text.replace(/\s/g, '_');
+          ec_new_user_text = ec_new_user_text.substr(0, 32);
           t2 = ec_new_user_text;
         if (ec_selected_action == 'ec_input_action_img') {

extensions/event_cats/admin/template/autolog_new.tpl

@@ -267 +267 @@
 <script type = "text/javascript"><!--
   ec_is_creation                          = {if $ec_is_creation}true{else}false{/if};
+  cat_display                             = {if $cat_display}true{else}false{/if};
   ec_up_code_lbl_forced_txt               = "{'ec_up_code_lbl_forced'|@translate}";
   ec_JS_message['ec_gen_user_act_miss']   = "{'ec_gen_user_act_miss'|@translate|@escape:javascript}";