Changeset 1690


Ignore:
Timestamp:
11/20/09 11:48:00 (14 years ago)
Author:
eduardoalex
Message:

Ticket #776 - Adicionada verificacao do conteudo da pesquisa para que nao haja caracteres invalidos

Location:
trunk/contactcenter
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/contactcenter/inc/class.ui_data.inc.php

    r1687 r1690  
    165165 
    166166                        $GLOBALS['phpgw']->template->set_var('cc_msg_name_mandatory',lang('Name is mandatory')); 
     167                        $GLOBALS['phpgw']->template->set_var('cc_msg_err_invalid_serch',lang('The query should not have the characters {%,?}')); 
    167168                        $GLOBALS['phpgw']->template->set_var('cc_msg_tel_or_mail_required',lang('Tel or email is required')); 
    168169 
  • trunk/contactcenter/js/cc_search.js

    r1598 r1690  
    161161                data['search_for']       = this.DOMinput.value; 
    162162                data['search_for_area']       = this.DOMinputx.value; 
    163  
     163                 
     164                var invalidChars = /[\%\?]/; 
     165                if(invalidChars.test(data['search_for'])){ 
     166                        showMessage(Element('cc_msg_err_invalid_serch').value); 
     167                        return; 
     168                } 
     169                 
    164170                var search_for = data['search_for'].split(' '); 
    165171                var greaterThan4 = false; 
  • trunk/contactcenter/templates/classic/index.tpl

    r1682 r1690  
    1414<!-- JS MESSAGES --> 
    1515<input id="cc_msg_name_mandatory" type="hidden" value="{cc_msg_name_mandatory}"> 
     16<input id="cc_msg_err_invalid_serch" type="hidden" value="{cc_msg_err_invalid_serch}">  
    1617<input id="cc_msg_tel_or_mail_required" type="hidden" value="{cc_msg_tel_or_mail_required}"> 
    1718<input id="cc_msg_not_allowed" type="hidden" value="{cc_msg_not_allowed}"> 
  • trunk/contactcenter/templates/default/index.tpl

    r1682 r1690  
    1414<!-- JS MESSAGES --> 
    1515<input id="cc_msg_name_mandatory" type="hidden" value="{cc_msg_name_mandatory}"> 
     16<input id="cc_msg_err_invalid_serch" type="hidden" value="{cc_msg_err_invalid_serch}"> 
    1617<input id="cc_msg_tel_or_mail_required" type="hidden" value="{cc_msg_tel_or_mail_required}"> 
    1718<input id="cc_msg_not_allowed" type="hidden" value="{cc_msg_not_allowed}"> 
Note: See TracChangeset for help on using the changeset viewer.