Changeset 3596
- Timestamp:
- 12/16/10 16:43:10 (13 years ago)
- Location:
- branches/2.2/mobile
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/mobile/inc/class.ui_home.inc.php
r3595 r3596 34 34 $this->template->set_var('lang_my_folders', lang("my folders")); 35 35 $this->template->set_var('lang_my_commitments', lang("my commitments")); 36 $this->template->set_var('lang_my_contacts', lang("my contacts"));36 $this->template->set_var('lang_my_contacts', lang("my contacts")); 37 37 $this->template->set_var('lang_new_mail', lang("new mail")); 38 38 $this->template->set_var('lang_mark_as_read', lang("mark as read")); … … 139 139 $p->set_var('lang_events',lang('events')); 140 140 $p->set_var('default_folders',$params['default_folders']); 141 $p->set_var('personal_folders',$params['personal_folders']); 141 $p->set_var('personal_folders',$params['personal_folders']); 142 $p->set_var('folder_to_search',$params['folder_to_search']); 142 143 $p->set_var('contacts_search',$params['contacts_search']); 144 $p->set_var('catalog_to_search',$params['catalog_to_search']); 143 145 $p->set_var('calendar_search',$params['calendar_search']); 144 146 $p->set_var('lang_more',lang("more")); … … 147 149 $p->set_var('show_more_messages',"none"); 148 150 $p->set_var('show_more_events',"none"); 151 $p->set_var('contacts_request_from', 152 isset($params["request_from"])? 153 $params["request_from"]:"none"); 149 154 150 155 //Contatos 151 156 if(($params["contacts_search"]==="1") || 152 (isset($params["catalog_to_search"]))) { 157 (isset($params["catalog_to_search"]) && $params["catalog_to_search"]!=="")) { 158 153 159 $bo_cc = CreateObject('mobile.bo_mobilecc'); 154 160 155 if(isset($params["catalog_to_search"]) )161 if(isset($params["catalog_to_search"]) && $params["catalog_to_search"]!=="") 156 162 $catalogs = array(0=>array("catalog"=>$params["catalog_to_search"], 157 163 "label" => $params["catalog_to_search"])); … … 183 189 unset($partial_result["has_more"]); 184 190 } 191 185 192 $contacts_result = array_merge($contacts_result,$partial_result); 186 193 187 194 } 188 $p->set_var('contacts',ui_mobilecc::print_contacts($contacts_result)); 195 196 if(isset($params['request_from']) && $params['request_from']!="none") //Buscas feitas requisitadas por outros modulos 197 $request_from = $params['request_from']; 198 else 199 $request_from = null; 200 $p->set_var('contacts',ui_mobilecc::print_contacts($contacts_result,false)); 189 201 } 190 202 else { … … 194 206 //E-mails 195 207 $no_mail_search=false; 196 if( !isset($params['folder_to_search'])) {208 if((!isset($params['folder_to_search'])) || ($params['folder_to_search']==="")) { 197 209 if($params['default_folders']==="1") { 198 210 if($params['personal_folders']!=="1") -
branches/2.2/mobile/inc/class.ui_mobilecc.inc.php
r3595 r3596 132 132 $this->template->set_var("actual_catalog",$this->page_info["actual_catalog"]); 133 133 $this->template->set_var("next_max_results",$this->page_info["actual_max_contacts"]+10); 134 $this->template->set_var("contacts_request_from", 135 $this->page_info["request_from"]==null? 136 "none":$this->page_info["request_from"]); 134 137 135 138 //Combo de catálogos … … 272 275 $contact["connections"]["connection2"]["connection_value"],19)); 273 276 274 $ p->fp('rows','row_contacts',True);277 $block = "row_contacts"; 275 278 } 276 279 else { //Grupos … … 279 282 $p->set_var('group_id',$contact["id_group"]); 280 283 $p->set_var('group_name',$contact["title"]); 281 $ p->fp('rows','row_groups',True);284 $block = "row_groups"; 282 285 } 283 286 … … 288 291 else { 289 292 $p->set_var('lang_see_details',strtoupper(lang("select"))); 290 $p->set_var( 'href_details','ui_mobilemail.add_recipient&mail=$mail&cn=$cn');293 $p->set_var("href_details','ui_mobilemail.add_recipient&mail=$mail&cn=$cn"); 291 294 } 295 296 $p->fp('rows',$block,True); 292 297 } 293 298 -
branches/2.2/mobile/templates/default/cc_main.tpl
r3595 r3596 15 15 <input type="hidden" name="menuaction" value="mobile.ui_home.search"> 16 16 <input type="hidden" name="catalog_to_search" value="{actual_catalog}"> 17 <input type="hidden" name="contacts_request_from" value="{contacts_request_from}"> 17 18 <input type="text" name="name"> 18 19 <button name="buscar_contato" class="btn-generico" onClick="document.getElementById('formu_busca').submit()">buscar contato</button> -
branches/2.2/mobile/templates/default/home_search.tpl
r3574 r3596 9 9 <input type="hidden" name="default_folders" value="{default_folders}"> 10 10 <input type="hidden" name="personal_folders" value="{personal_folders}"> 11 <input type="hidden" name="folder_to_search" value="{folder_to_search}"> 11 12 <input type="hidden" name="contacts_search" value="{contacts_search}"> 13 <input type="hidden" name="catalog_to_search" value="{catalog_to_search}"> 12 14 <input type="hidden" name="calendar_search" value="{calendar_search}"> 15 16 <input type="hidden" name="contacts_request_from" value="{contacts_request_from}"> 13 17 <input type="hidden" name="name" value="{search_param}"> 14 18 <input type="text" name="name"> <input type="submit" class="btn-generico" value="{lang_search}" ></form> … … 26 30 <input type="hidden" name="default_folders" value="{default_folders}"> 27 31 <input type="hidden" name="personal_folders" value="{personal_folders}"> 32 <input type="hidden" name="folder_to_search" value="{folder_to_search}"> 28 33 <input type="hidden" name="contacts_search" value="{contacts_search}"> 34 <input type="hidden" name="catalog_to_search" value="{catalog_to_search}"> 29 35 <input type="hidden" name="calendar_search" value="{calendar_search}"> 30 36 <input type="hidden" name="name" value="{search_param}"> … … 42 48 <input type="hidden" name="default_folders" value="{default_folders}"> 43 49 <input type="hidden" name="personal_folders" value="{personal_folders}"> 50 <input type="hidden" name="folder_to_search" value="{folder_to_search}"> 44 51 <input type="hidden" name="contacts_search" value="{contacts_search}"> 52 <input type="hidden" name="catalog_to_search" value="{catalog_to_search}"> 45 53 <input type="hidden" name="calendar_search" value="{calendar_search}"> 46 54 <input type="hidden" name="name" value="{search_param}"> … … 58 66 <input type="hidden" name="default_folders" value="{default_folders}"> 59 67 <input type="hidden" name="personal_folders" value="{personal_folders}"> 68 <input type="hidden" name="folder_to_search" value="{folder_to_search}"> 60 69 <input type="hidden" name="contacts_search" value="{contacts_search}"> 70 <input type="hidden" name="catalog_to_search" value="{catalog_to_search}"> 61 71 <input type="hidden" name="calendar_search" value="{calendar_search}"> 62 72 <input type="hidden" name="name" value="{search_param}">
Note: See TracChangeset
for help on using the changeset viewer.