[Vtigercrm-commits] [vtiger-commits] r5963 - in /vtigercrm/branches/5.0_postgresql_integration: Smarty/templates/ include/js/ include/utils/ modules/Emails/ modules/Users/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Sun May 14 11:36:02 EDT 2006
Author: jeffk
Date: Sun May 14 09:35:52 2006
New Revision: 5963
Log:
refs #752. merge trunk changesets [5959] through [5961]
Modified:
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Buttons_List.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Buttons_List1.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ComposeEmail.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailContents.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Emails.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/salesEditView.tpl
vtigercrm/branches/5.0_postgresql_integration/include/js/Mail.js
vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.js
vtigercrm/branches/5.0_postgresql_integration/modules/Users/Popup_picker_emails.html
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Buttons_List.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Buttons_List.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Buttons_List.tpl Sun May 14 09:35:52 2006
@@ -14,7 +14,7 @@
<tr><td style="height:2px"></td></tr>
<tr>
- <td style="padding-left:10px;padding-right:30px" class="moduleName" nowrap>{$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$MODULE}</a></td>
+ <td style="padding-left:10px;padding-right:30px" class="moduleName" nowrap>{$APP.$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$APP.$MODULE}</a></td>
<td class="sep1" style="width:1px;padding-right:1px"></td>
<td class=small >
<table border=0 cellspacing=0 cellpadding=0>
@@ -68,18 +68,18 @@
<td class="sep1" style="width:1px;padding-right:1px"></td>
<td nowrap style="width:50%;padding:10px">
{if $CHECK.Import eq 'yes' && $CHECK.Export eq 'yes'}
- <a href="index.php?module={$MODULE}&action=Import&step=2&return_module={$MODULE}&return_action=index">{$APP.LBL_IMPORT} {$MODULE}</a> |
- <a href="index.php?module={$MODULE}&action=Export&all=1">{$APP.LBL_EXPORT} {$MODULE}</a>
+ <a href="index.php?module={$MODULE}&action=Import&step=2&return_module={$MODULE}&return_action=index">{$APP.LBL_IMPORT} {$APP.$MODULE}</a> |
+ <a href="index.php?module={$MODULE}&action=Export&all=1">{$APP.LBL_EXPORT} {$APP.$MODULE}</a>
{elseif $CHECK.Import eq 'yes' && $CHECK.Export eq 'no'}
- <a href="index.php?module={$MODULE}&action=Import&step=2&return_module={$MODULE}&return_action=index">{$APP.LBL_IMPORT} {$MODULE}</a>
+ <a href="index.php?module={$MODULE}&action=Import&step=2&return_module={$MODULE}&return_action=index">{$APP.LBL_IMPORT} {$APP.$MODULE}</a>
{elseif $CHECK.Import eq 'no' && $CHECK.Export eq 'yes' }
- <a href="index.php?module={$MODULE}&action=Export&all=1">{$APP.LBL_EXPORT} {$MODULE}</a>
+ <a href="index.php?module={$MODULE}&action=Export&all=1">{$APP.LBL_EXPORT} {$APP.$MODULE}</a>
{/if}
{elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'}
<td class="sep1" style="width:1px"></td>
<td nowrap style="width:50%;padding:10px">
{if $CHECK.Export eq 'yes'}
- <a href="index.php?module={$MODULE}&action=Export&all=1">{$APP.LBL_EXPORT} {$MODULE}</a>
+ <a href="index.php?module={$MODULE}&action=Export&all=1">{$APP.LBL_EXPORT} {$APP.$MODULE}</a>
{/if}
</td>
{else}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Buttons_List1.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Buttons_List1.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Buttons_List1.tpl Sun May 14 09:35:52 2006
@@ -14,7 +14,7 @@
<tr><td style="height:2px"></td></tr>
<tr>
- <td style="padding-left:10px;padding-right:30px" class="moduleName" nowrap>{$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$MODULE}</a></td>
+ <td style="padding-left:10px;padding-right:30px" class="moduleName" nowrap>{$APP.$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$APP.$MODULE}</a></td>
<td class="sep1" style="width:1px;padding-right:1px"></td>
<td class=small >
<table border=0 cellspacing=0 cellpadding=0>
@@ -65,18 +65,18 @@
<td class="sep1" style="width:1px;padding-right:1px"></td>
<td nowrap style="width:50%;padding:10px">
{if $CHECK.Import eq 'yes' && $CHECK.Export eq 'yes'}
- <a href="index.php?module={$MODULE}&action=Import&step=2&return_module={$MODULE}&return_action=index">{$APP.LBL_IMPORT} {$MODULE}</a> |
- <a href="index.php?module={$MODULE}&action=Export&all=1">{$APP.LBL_EXPORT} {$MODULE}</a>
+ <a href="index.php?module={$MODULE}&action=Import&step=2&return_module={$MODULE}&return_action=index">{$APP.LBL_IMPORT} {$APP.$MODULE}</a> |
+ <a href="index.php?module={$MODULE}&action=Export&all=1">{$APP.LBL_EXPORT} {$APP.$MODULE}</a>
{elseif $CHECK.Import eq 'yes' && $CHECK.Export eq 'no'}
- <a href="index.php?module={$MODULE}&action=Import&step=2&return_module={$MODULE}&return_action=index">{$APP.LBL_IMPORT} {$MODULE}</a>
+ <a href="index.php?module={$MODULE}&action=Import&step=2&return_module={$MODULE}&return_action=index">{$APP.LBL_IMPORT} {$APP.$MODULE}</a>
{elseif $CHECK.Import eq 'no' && $CHECK.Export eq 'yes' }
- <a href="index.php?module={$MODULE}&action=Export&all=1">{$APP.LBL_EXPORT} {$MODULE}</a>
+ <a href="index.php?module={$MODULE}&action=Export&all=1">{$APP.LBL_EXPORT} {$APP.$MODULE}</a>
{/if}
{elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'}
<td class="sep1" style="width:1px"></td>
<td nowrap style="width:50%;padding:10px">
{if $CHECK.Export eq 'yes'}
- <a href="index.php?module={$MODULE}&action=Export&all=1">{$APP.LBL_EXPORT} {$MODULE}</a>
+ <a href="index.php?module={$MODULE}&action=Export&all=1">{$APP.LBL_EXPORT} {$APP.$MODULE}</a>
{/if}
</td>
{else}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ComposeEmail.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ComposeEmail.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ComposeEmail.tpl Sun May 14 09:35:52 2006
@@ -90,7 +90,7 @@
{elseif $elements.2.0 eq 'subject'}
<tr>
<td class="lvtCol" style="padding: 5px;" align="right" nowrap><font color="red">*</font>{$elements.1.0} :</td>
- <td colspan="2" class="dvtCellLabel" style="padding: 5px;"><input type="text" class="txtBox" name="{$elements.2.0}" value="{$elements.3.0}"></td>
+ <td colspan="2" class="dvtCellLabel" style="padding: 5px;"><input type="text" class="txtBox" name="{$elements.2.0}" value="{$elements.3.0}" id="{$elements.2.0}"></td>
</tr>
{elseif $elements.2.0 eq 'filename'}
@@ -114,8 +114,8 @@
<tr>
<td colspan="3" class="lvtCol" style="padding: 5px;" align="center">
- <input title="Save [Alt+S]" accessKey="S" class="classBtn" onclick="this.form.action.value='Save';" type="submit" name="button" value="Save" >
- <input name="send" value=" Send " class="classBtn" type="submit" onclick="this.form.action.value='Save';this.form.send_mail.value='true';">
+ <input title="Save [Alt+S]" accessKey="S" class="classBtn" onclick="return email_validate(this.form,'save');" type="button" name="button" value="Save" >
+ <input name="send" value=" Send " class="classBtn" type="button" onclick="return email_validate(this.form,'send');">
<input name="cancel" value=" Cancel " class="classBtn" type="button" onClick="window.close()">
</td>
</tr>
@@ -123,4 +123,32 @@
</table>
</form>
</body>
+{literal}
+<script>
+function email_validate(oform,mode)
+{
+ if(oform.parent_name.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0)
+ {
+ alert('No recipients were specified');
+ return false;
+ }
+ if(oform.subject.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0)
+ {
+ if(email_sub = prompt('You did not specify a subject from this email. If you would like to provide one, please type it now','(no-Subject)'))
+ {
+ oform.subject.value = email_sub;
+ }else
+ {
+ return false;
+ }
+ }
+ if(mode == 'send')
+ {
+ oform.send_mail.value='true';
+ }
+ oform.action.value='Save';
+ oform.submit();
+}
+</script>
+{/literal}
</html>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateView.tpl Sun May 14 09:35:52 2006
@@ -59,11 +59,11 @@
<div class="small" style="padding:20px">
{if $OP_MODE eq 'edit_view'}
- <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} - Editing {$SINGLE_MOD} Information</span> <br>
+ <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} - {$APP.LBL_EDITING} {$SINGLE_MOD} {$APP.LBL_INFORMATION}</span> <br>
{$UPDATEINFO}
{/if}
{if $OP_MODE eq 'create_view'}
- <span class="lvtHeaderText">Creating New {$SINGLE_MOD}</span> <br>
+ <span class="lvtHeaderText">{$APP.LBL_CREATING} {$APP.LBL_NEW} {$SINGLE_MOD}</span> <br>
{/if}
<hr noshade size=1>
@@ -80,11 +80,11 @@
<td class="dvtTabCache" style="width:10px" nowrap> </td>
{if $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Contacts' || $MODULE eq 'Products'}
- <td width=75 style="width:15%" align="center" nowrap="nowrap" class="dvtSelectedCell" id="bi" onclick="fnLoadValues('bi','mi','basicTab','moreTab')"><b>Basic Information</b></td>
- <td class="dvtUnSelectedCell" style="width: 100px;" align="center" nowrap="nowrap" id="mi" onclick="fnLoadValues('mi','bi','moreTab','basicTab')"><b>More Information </b></td>
+ <td width=75 style="width:15%" align="center" nowrap="nowrap" class="dvtSelectedCell" id="bi" onclick="fnLoadValues('bi','mi','basicTab','moreTab')"><b>{$APP.LBL_BASIC} {$APP.LBL_INFORMATION}</b></td>
+ <td class="dvtUnSelectedCell" style="width: 100px;" align="center" nowrap="nowrap" id="mi" onclick="fnLoadValues('mi','bi','moreTab','basicTab')"><b>{$APP.LBL_MORE} {$APP.LBL_INFORMATION} </b></td>
<td class="dvtTabCache" style="width:100%" nowrap="nowrap"> </td>
{else}
- <td class="dvtSelectedCell" align=center nowrap>Basic Information</td>
+ <td class="dvtSelectedCell" align=center nowrap>{$APP.LBL_BASIC} {$APP.LBL_INFORMATION}</td>
<td class="dvtTabCache" style="width:100%"> </td>
{/if}
<tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailView.tpl Sun May 14 09:35:52 2006
@@ -65,7 +65,7 @@
<div class="small" style="padding:20px" >
<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%"><tr><td>
- <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} - {$SINGLE_MOD} Information</span> <span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span><span id="vtbusy_info" style="visibility:hidden;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span></td><td> </td></tr>
+ <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} - {$APP[$SINGLE_MOD]} {$APP.LBL_INFORMATION}</span> <span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span><span id="vtbusy_info" style="visibility:hidden;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span></td><td> </td></tr>
<tr height=20><td>{$UPDATEINFO}</td><td align="right" width="400" nowrap><div id="addtagdiv"><a href="javascript:;" onClick="show('tagdiv'),hide('addtagdiv'),document.getElementById('txtbox_tagfields').focus()">+addtag</a></div><div id="tagdiv" style="display:none;"><input class="textbox" type="text" id="txtbox_tagfields" name="textbox_First Name" value=""></input> <input name="button_tagfileds" type="button" class="small" value="Tag it" onclick="return tagvalidate()"/><input name="close" type="button" class="small" value="Close" onClick="hide('tagdiv'),show('addtagdiv')"></div></td></tr>
</table>
<hr noshade size=1>
@@ -78,12 +78,12 @@
<tr>
<td class="dvtTabCache" style="width:10px" nowrap> </td>
{if $MODULE eq 'Notes' || $MODULE eq 'Faq' || $MODULE eq 'Webmails' || ($MODULE eq 'Activities' && $ACTIVITY_MODE eq 'Task')}
- <td class="dvtSelectedCell" align=center nowrap>{$SINGLE_MOD} Information</td>
+ <td class="dvtSelectedCell" align=center nowrap>{$SINGLE_MOD} {$APP.LBL_INFORMATION}</td>
<td class="dvtTabCache" style="width:100%"> </td>
{else}
- <td class="dvtSelectedCell" align=center nowrap>{$SINGLE_MOD} Information</td>
+ <td class="dvtSelectedCell" align=center nowrap>{$SINGLE_MOD} {$APP.LBL_INFORMATION}</td>
<td class="dvtTabCache" style="width:10px"> </td>
- <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=CallRelatedList&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">More Information</a></td>
+ <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=CallRelatedList&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</a></td>
<td class="dvtTabCache" style="width:100%"> </td>
{/if}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailContents.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailContents.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailContents.tpl Sun May 14 09:35:52 2006
@@ -20,8 +20,8 @@
{foreach key=id item=row from=$LISTENTITY}
<tr onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOff'">
<td>
- <input type="checkbox" name="selected_id" value= '{$id}' onClick=toggleSelectAll(this.name,"selectall")>
-</td>
+ <span><input type="checkbox" name="selected_id" value= '{$id}' onClick=toggleSelectAll(this.name,"selectall")>
+</span></td>
{foreach item=row_values from=$row}
<td><b>{$row_values}</b></td>
{/foreach}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Emails.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Emails.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Emails.tpl Sun May 14 09:35:52 2006
@@ -36,21 +36,21 @@
function DeleteEmail(id)
{
if(confirm("Are you sure you want to delete ?"))
- {
- show("status");
- var ajaxObj = new Ajax(ajaxDelResponse);
- var urlstring ="module=Users&action=massdelete&return_module=Emails&idlist="+id;
- ajaxObj.process("index.php?",urlstring);
- }
- else
- {
- return false;
- }
+ {
+ show("status");
+ var ajaxObj = new Ajax(ajaxDelResponse);
+ var urlstring ="module=Users&action=massdelete&return_module=Emails&idlist="+id;
+ ajaxObj.process("index.php?",urlstring);
+ }
+ else
+ {
+ return false;
+ }
}
function ajaxDelResponse(response)
{
hide("status");
- document.getElementById("EmailDetails").innerHTML='';
+ document.getElementById('EmailDetails').innerHTML = '<table valign="top" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td class="forwardBg"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colspan="2"> </td></tr></tbody></table></td></tr><tr><td style="padding-top: 10px;" bgcolor="#ffffff" height="300" valign="top"></td></tr></tbody></table>';
document.getElementById("subjectsetter").innerHTML='';
document.getElementById("email_con").innerHTML=response.responseText;
}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/salesEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/salesEditView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/salesEditView.tpl Sun May 14 09:35:52 2006
@@ -55,11 +55,11 @@
<div class="small" style="padding:20px">
{if $OP_MODE eq 'edit_view'}
- <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} - Editing {$SINGLE_MOD} Information</span> <br>
+ <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} - {$APP.LBL_EDITING} {$SINGLE_MOD} {$APP.LBL_INFORMATION}</span> <br>
{$UPDATEINFO}
{/if}
{if $OP_MODE eq 'create_view'}
- <span class="lvtHeaderText">Creating {$SINGLE_MOD}</span> <br>
+ <span class="lvtHeaderText">{$APP.LBL_CREATING} {$SINGLE_MOD}</span> <br>
{/if}
<hr noshade size=1>
@@ -76,13 +76,13 @@
<tr>
<td class="dvtTabCache" style="width:10px" nowrap> </td>
{if $MODULE eq 'Notes' || $MODULE eq 'Faq'}
- <td class="dvtSelectedCell" align=center nowrap>{$SINGLE_MOD} Information</td>
+ <td class="dvtSelectedCell" align=center nowrap>{$SINGLE_MOD} {$APP.LBL_INFORMATION}</td>
<td class="dvtTabCache" style="width:100%"> </td>
{else}
- <td class="dvtSelectedCell" align=center nowrap>{$SINGLE_MOD} Information</td>
+ <td class="dvtSelectedCell" align=center nowrap>{$SINGLE_MOD} {$APP.LBL_INFORMATION}</td>
<td class="dvtTabCache" style="width:10px"> </td>
{if $OP_MODE neq 'create_view'}
- <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=CallRelatedList&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}" onclick="getRelatedLink()">More Information</a></td>
+ <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=CallRelatedList&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}" onclick="getRelatedLink()">{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</a></td>
{/if}
<td class="dvtTabCache" style="width:100%"> </td>
@@ -310,7 +310,7 @@
{/foreach}
{/foreach}
{if $check eq 0}
- {assign var=select_user value='checked'}
+ {assign var=select_user value='checked'}`
{assign var=style_user value='display:block'}
{assign var=style_group value='display:none'}
{else}
Modified: vtigercrm/branches/5.0_postgresql_integration/include/js/Mail.js
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/js/Mail.js (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/js/Mail.js Sun May 14 09:35:52 2006
@@ -99,8 +99,16 @@
//added by rdhital for better emails
function set_return_emails(entity_id,email_id,parentname,emailadd){
+ if(emailadd != '')
+ {
window.opener.document.EditView.parent_id.value = window.opener.document.EditView.parent_id.value+entity_id+'@'+email_id+'|';
window.opener.document.EditView.parent_name.value = window.opener.document.EditView.parent_name.value+parentname+'<'+emailadd+'>; ';
+ window.close();
+ }else
+ {
+ alert('The Record '+parentname+' does\'t have email id' );
+ return false;
+ }
}
//added by raju for emails
Modified: vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php Sun May 14 09:35:52 2006
@@ -1269,8 +1269,7 @@
//Change this index 0 - to get the fieldid based on email1 or email2
$fieldid = $adb->query_result($queryres,0,'fieldid');
- $value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_emails('.$entity_id.','.$fieldid.',"'
- .$name.'","'.$emailaddress.'"); window.close(); \'>'.$name.'</a>';
+ $value = '<a href="a" LANGUAGE=javascript onclick=\'return set_return_emails('.$entity_id.','.$fieldid.',"'.$name.'","'.$emailaddress.'"); \'>'.$name.'</a>';
}elseif ($module=='Contacts' || $module=='Leads')
{
@@ -1287,7 +1286,7 @@
$fieldid = $adb->query_result($queryres,0,'fieldid');
//$value = '<a href="javascript: submitform('.$entity_id.');">'.$name.'</a>';
- $value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_emails('.$entity_id.','.$fieldid.',"'.$name.'","'.$emailaddress.'"); window.close(); \'>'.$name.'</a>';
+ $value = '<a href="a" LANGUAGE=javascript onclick=\'return set_return_emails('.$entity_id.','.$fieldid.',"'.$name.'","'.$emailaddress.'"); \'>'.$name.'</a>';
}
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.js
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.js (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.js Sun May 14 09:35:52 2006
@@ -27,7 +27,8 @@
if (document.massdelete.selected_id.checked)
{
- document.massdelete.idlist.value=document.massdelete.selected_id.value;
+ idstring = document.massdelete.selected_id.value+':';
+ xx = 1;
}
else
{
@@ -68,3 +69,4 @@
return false;
}
}
+
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/Popup_picker_emails.html
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/Popup_picker_emails.html (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/Popup_picker_emails.html Sun May 14 09:35:52 2006
@@ -86,7 +86,7 @@
<!-- BEGIN: row -->
<tr height=20 class={ROW_COLOR}>
<td WIDTH="2" class="blackLine"><IMG SRC="include/images/blank.gif">
- <td valign=TOP style="padding:0px 3px 0px 3px;" ><a href="a" LANGUAGE=javascript onclick='set_return_emails("{USER.ID}",-1,"{USER.FIRST_NAME} {USER.LAST_NAME}","{USER.EMAIL1}"); window.close()'>{USER.FIRST_NAME} {USER.LAST_NAME}</a></td>
+ <td valign=TOP style="padding:0px 3px 0px 3px;" ><a href="a" LANGUAGE=javascript onclick='return set_return_emails("{USER.ID}",-1,"{USER.FIRST_NAME} {USER.LAST_NAME}","{USER.EMAIL1}");'>{USER.FIRST_NAME} {USER.LAST_NAME}</a></td>
<td WIDTH="2" class="blackLine"><IMG SRC="include/images/blank.gif">
<td valign=TOP style="padding:0px 3px 0px 3px;" >{USER.USER_NAME}</td>
<td WIDTH="2" class="blackLine"><IMG SRC="include/images/blank.gif">
More information about the vtigercrm-commits
mailing list