[Vtigercrm-commits] [vtiger-commits] r10043 - in /vtigercrm/branches/5.0.3: Smarty/templates/ActivityListView.tpl modules/Calendar/Calendar.php modules/Calendar/addEventUI.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Fri Jan 12 02:12:59 EST 2007
Author: richie
Date: Fri Jan 12 00:12:52 2007
New Revision: 10043
Log:
Assigned To group name display in relatedlist added
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl
vtigercrm/branches/5.0.3/modules/Calendar/Calendar.php
vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php
Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl Fri Jan 12 00:12:52 2007
@@ -442,19 +442,10 @@
<input type = "radio" name = "user_lead_owner" onclick=checkgroup(); checked>{$APP.LBL_USER}
<input type = "radio" name = "user_lead_owner" onclick=checkgroup(); >{$APP.LBL_GROUP}<br>
<select name="lead_owner" id="lead_owner" class="detailedViewTextBox">
- {foreach key=id item=data from=$CHANGE_USER}
- {foreach key=chOw_id item=name from=$data}
- <option value={$id}{$name}>{$chOw_id}</option>
- {/foreach}
- {/foreach}
+ {$CHANGE_OWNER}
</select>
<select name="lead_group_owner" id="lead_group_owner" class="detailedViewTextBox" style="display:none;">
- {foreach key=id item=data from=$CHANGE_GROUP}
- {foreach key=chOw_group_id item=group_name from=$data}
- <option value={$id}{$group_name}>{$chOw_group_id}</option>
- {/foreach}
- {/foreach}
-
+ {$CHANGE_GROUP_OWNER}
</select>
</form>
</td>
Modified: vtigercrm/branches/5.0.3/modules/Calendar/Calendar.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/Calendar.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/Calendar.php Fri Jan 12 00:12:52 2007
@@ -29,6 +29,7 @@
/*
constructor
*/
+ var $groupTable = Array('vtiger_activitygrouprelation','activityid');
function Calendar($view='',$data=Array())
{
$this->view = $view;
Modified: vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php Fri Jan 12 00:12:52 2007
@@ -26,8 +26,6 @@
$date_format = parse_calendardate($app_strings['NTC_DATE_FORMAT']);
$taskassignedto = getAssignedTo(9);
$eventassignedto = getAssignedTo(16);
- $userList = $eventassignedto[0];
- $groupList = $eventassignedto[1];
$mysel= $_GET['view'];
$calendar_arr = Array();
$calendar_arr['IMAGE_PATH'] = $image_path;
@@ -594,8 +592,8 @@
<td><b><?php echo $app_strings['Contacts'] ?></b></td>
<td colspan="2">
<input name="contactidlist" id="contactidlist" value="" type="hidden">
- <textarea rows="5" name="contactlist" readonly="readonly" class="calTxt" id="parentid"></textarea>
- <input type="button" onclick="selectContact('true','general',document.EditView)" class="crmButton small edit" name="selectcnt" value="<?php echo $mod_strings['LBL_SELECT_CONTACT'] ; ?>">
+ <textarea rows="5" name="contactlist" readonly="readonly" class="calTxt"></textarea>
+ <input type="button" onclick="return window.open('index.php?module=Contacts&action=Popup&return_module=Calendar&popuptype=detailview&select=enable&form=EditView&form_submit=false','test','width=640,height=602,resizable=0,scrollbars=0');" class="crmButton small edit" name="selectcnt" value="<?php echo $mod_strings['LBL_SELECT_CONTACT'] ; ?>">
</td>
</tr>
</table>
@@ -823,7 +821,7 @@
</td>
<td>
<div id="taskrelatedto" align="left">
- <input name="task_parent_name" readonly type="text" class="calTxt small" value="">
+ <input name="task_parent_name" readonly type="text" class="calTxt small" value="">
<input type="button" name="selectparent" class="crmButton small edit" value="<?php echo $mod_strings['LBL_SELECT']; ?>" onclick="return window.open('index.php?module='+document.createTodo.task_parent_type.value+'&action=Popup&maintab=Calendar','test','width=640,height=602,resizable=0,scrollbars=0,top=150,left=200');">
</div>
</td>
@@ -833,8 +831,8 @@
<tr>
<td><b><?php echo $mod_strings['LBL_CONTACT_NAME'] ?></b></td>
<td colspan="2">
- <input name="task_contact_name" id="contact_name" readonly type="text" class="calTxt" value="" ><input name="task_contact_id" id="contact_id" type="hidden" value="">
- <input type="button" onclick="selectContact('false','task',document.createTodo);" class="crmButton small edit" name="selectcnt" value="<?php echo $mod_strings['LBL_SELECT_CONTACT'] ; ?>">
+ <input name="task_contact_name" id="contact_name" readonly type="text" class="calTxt" value=""><input name="task_contact_id" id="contact_id" type="hidden" value="">
+ <input type="button" onclick="return window.open('index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView','test','width=640,height=602,resizable=0,scrollbars=0');" class="crmButton small edit" name="selectcnt" value="<?php echo $mod_strings['LBL_SELECT_CONTACT'] ; ?>">
</td>
</tr>
<?php } ?>
@@ -887,30 +885,10 @@
<input type = "radio" name = "user_lead_owner" onclick=checkgroup(); checked><?php echo $app_strings['LBL_USER'];?>
<input type = "radio" name = "user_lead_owner" onclick=checkgroup(); ><?php echo $app_strings['LBL_GROUP'];?><br>
<select name="lead_owner" id="lead_owner" class="detailedViewTextBox" style="display:block">
- <?php
- foreach($userList as $id=>$string)
- {
- foreach($string as $key => $value)
- {
- echo "<option value='$id' '$value'>$key</option>";
- }
- }
-
- ?>
+ <?php echo getUserslist(); ?>
</select>
<select name="lead_group_owner" id="lead_group_owner" class="detailedViewTextBox" style="display:none;">
- <?php
- foreach($groupList as $id => $string)
- {
- foreach($string as $key => $value)
- {
-
- echo "<option value='$id' '$value'>$key</option>";
- }
- }
-
- ?>
-
+ <?php echo getGroupslist();?>
</select>
</td>
</tr>
More information about the vtigercrm-commits
mailing list