[Vtigercrm-commits] [vtiger-commits] r9962 - in /vtigercrm/branches/5.0.3: Smarty/templates/ include/js/ include/utils/ modules/Settings/ modules/Settings/language/ modules/Users/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Wed Dec 13 04:48:11 EST 2006
Author: richie
Date: Wed Dec 13 02:47:57 2006
New Revision: 9962
Log:
Groups moved to settings
Added:
vtigercrm/branches/5.0.3/modules/Settings/GroupDetailView.php
vtigercrm/branches/5.0.3/modules/Settings/createnewgroup.php
vtigercrm/branches/5.0.3/modules/Settings/listgroups.php
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/GroupDetailview.tpl
vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl
vtigercrm/branches/5.0.3/Smarty/templates/ListGroup.tpl
vtigercrm/branches/5.0.3/Smarty/templates/UserGroups.tpl
vtigercrm/branches/5.0.3/include/js/dtlviewajax.js
vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php
vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php
vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
vtigercrm/branches/5.0.3/modules/Users/DeleteGroup.php
Modified: vtigercrm/branches/5.0.3/Smarty/templates/GroupDetailview.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/GroupDetailview.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/GroupDetailview.tpl Wed Dec 13 02:47:57 2006
@@ -23,14 +23,14 @@
<!-- DISPLAY -->
<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
<form action="index.php" method="post" name="new" id="form">
- <input type="hidden" name="module" value="Users">
+ <input type="hidden" name="module" value="Settings">
<input type="hidden" name="action" value="createnewgroup">
<input type="hidden" name="groupId" value="{$GROUPID}">
<input type="hidden" name="mode" value="edit">
<input type="hidden" name="parenttab" value="Settings">
<tr>
<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-groups.gif" width="48" height="48" border=0 ></td>
- <td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> > {$CMOD.LBL_VIEWING} "{$GROUPINFO.0.groupname}" </b></td>
+ <td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> > {$CMOD.LBL_VIEWING} "{$GROUPINFO.0.groupname}" </b></td>
</tr>
<tr>
<td valign=top class="small">{$CMOD.LBL_VIEWING} {$CMOD.LBL_PROPERTIES} "{$GROUPINFO.0.groupname}`" {$CMOD.LBL_GROUP_NAME} </td>
@@ -92,7 +92,15 @@
<td width="16"><div align="center"></div></td>
<td>
{foreach item=element from=$details}
+ {if $element.memberaction == "GroupDetailView"}
+ <a href="index.php?module=Settings&action={$element.memberaction}&{$element.actionparameter}={$element.memberid}">{$element.membername}</a><br />
+ {/if}
+ {if $element.memberaction == "RoleDetailView"}
+ <a href="index.php?module=Settings&action={$element.memberaction}&{$element.actionparameter}={$element.memberid}">{$element.membername}</a><br />
+ {/if}
+ {if $element.memberaction == "DetailView"}
<a href="index.php?module=Users&action={$element.memberaction}&{$element.actionparameter}={$element.memberid}">{$element.membername}</a><br />
+ {/if}
{/foreach}
</td>
</tr>
Modified: vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl Wed Dec 13 02:47:57 2006
@@ -172,9 +172,9 @@
<tr>
<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-groups.gif" alt="Groups" width="48" height="48" border=0 title="Roles"></td>
{if $MODE eq 'edit'}
- <td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> > {$MOD.LBL_EDIT} "{$GROUPNAME}" </b></td>
+ <td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> > {$MOD.LBL_EDIT} "{$GROUPNAME}" </b></td>
{else}
- <td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> > {$CMOD.LBL_CREATE_NEW_GROUP}</b></td>
+ <td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> > {$CMOD.LBL_CREATE_NEW_GROUP}</b></td>
{/if}
</tr>
<tr>
Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListGroup.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ListGroup.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ListGroup.tpl Wed Dec 13 02:47:57 2006
@@ -23,7 +23,7 @@
<!-- DISPLAY -->
<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
<form action="index.php" method="post" name="new" id="form">
- <input type="hidden" name="module" value="Users">
+ <input type="hidden" name="module" value="Settings">
<input type="hidden" name="action" value="createnewgroup">
<input type="hidden" name="mode" value="create">
<input type="hidden" name="parenttab" value="Settings">
@@ -67,11 +67,11 @@
<tr>
<td class="listTableRow small" valign=top>{$smarty.foreach.grouplist.iteration}</td>
<td class="listTableRow small" valign=top nowrap>
- <a href="index.php?module=Users&action=createnewgroup&returnaction=listgroups&parenttab=Settings&mode=edit&groupId={$groupvalues.groupid}"><img src="{$IMAGE_PATH}editfield.gif" alt="{$APP.LNK_EDIT}" title="{$APP.LNK_EDIT}" border="0" align="absmiddle"></a> |
+ <a href="index.php?module=Settings&action=createnewgroup&returnaction=listgroups&parenttab=Settings&mode=edit&groupId={$groupvalues.groupid}"><img src="{$IMAGE_PATH}editfield.gif" alt="{$APP.LNK_EDIT}" title="{$APP.LNK_EDIT}" border="0" align="absmiddle"></a> |
<a href="#" onClick="deletegroup(this,'{$groupvalues.groupid}')";><img src="{$IMAGE_PATH}delete.gif" alt="{$LNK_DELETE}" title="{$APP.LNK_DELETE}" border="0" align="absmiddle"></a>
</td>
<td class="listTableRow small" valign=top><strong>
- <a href="index.php?module=Users&action=GroupDetailView&parenttab=Settings&groupId={$groupvalues.groupid}">{$groupvalues.groupname}</a></strong>
+ <a href="index.php?module=Settings&action=GroupDetailView&parenttab=Settings&groupId={$groupvalues.groupid}">{$groupvalues.groupname}</a></strong>
</td>
<td class="listTableRow small" valign=top>{$groupvalues.description}</td>
</tr>
Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserGroups.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/UserGroups.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/UserGroups.tpl Wed Dec 13 02:47:57 2006
@@ -19,7 +19,7 @@
<tr>
<td class="listTableRow small" valign="top" width="5%">{$smarty.foreach.groupiter.iteration}</td>
{if $IS_ADMIN}
-<td class="listTableRow small" valign="top"><a href="index.php?module=Users&action=GroupDetailView&parenttab=Settings&groupId={$id}">{$groupname.1}</a></td>
+<td class="listTableRow small" valign="top"><a href="index.php?module=Settings&action=GroupDetailView&parenttab=Settings&groupId={$id}">{$groupname.1}</a></td>
{else}
<td class="listTableRow small" valign="top">{$groupname.1}</td>
{/if}
Modified: vtigercrm/branches/5.0.3/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/dtlviewajax.js (original)
+++ vtigercrm/branches/5.0.3/include/js/dtlviewajax.js Wed Dec 13 02:47:57 2006
@@ -238,7 +238,7 @@
getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=DetailView&record="+tagValue+"\">"+hdObj.value+" </a>";
}else if(isAdmin == "1" && assign_type_G == true)
{
- getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=GroupDetailView&groupId="+tagValue+"\">"+hdObj.value+" </a>";
+ getObj(dtlView).innerHTML = "<a href=\"index.php?module=Settings&action=GroupDetailView&groupId="+tagValue+"\">"+hdObj.value+" </a>";
}
}else if(uitype == '56')
{
Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Wed Dec 13 02:47:57 2006
@@ -222,7 +222,7 @@
$label_fld["secid"][] = $user_id;
$label_fld["link"][] = "index.php?module=Users&action=DetailView&record=".$user_id;
$label_fld["secid"][] = $groupid;
- $label_fld["link"][] = "index.php?module=Users&action=GroupDetailView&groupId=".$groupid;
+ $label_fld["link"][] = "index.php?module=Settings&action=GroupDetailView&groupId=".$groupid;
}
//Security Checks
if($fieldlabel == 'Assigned To' && $is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module)] == 3 or $defaultOrgSharingPermission[getTabid($module)] == 0))
Modified: vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php Wed Dec 13 02:47:57 2006
@@ -613,7 +613,7 @@
$sql = "insert into vtiger_groups(name,description) values('" .$groupName ."','". $groupDescription ."')";
$result = $adb->query($sql);
$log->debug("Exiting createNewGroup method ...");
- header("Location: index.php?module=Users&action=listgroups");
+ header("Location: index.php?module=Settings&action=listgroups");
}
@@ -3789,7 +3789,7 @@
if($entityType == 'groups')
{
$groupNameArr = getGroupInfo($entityid);
- $display_out = "<a href='index.php?module=Users&action=GroupDetailView&returnaction=OrgSharingDetailView&groupId=".$entityid."'>Group::". $groupNameArr[0]." </a>";
+ $display_out = "<a href='index.php?module=Settings&action=GroupDetailView&returnaction=OrgSharingDetailView&groupId=".$entityid."'>Group::". $groupNameArr[0]." </a>";
}
elseif($entityType == 'roles')
{
Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Wed Dec 13 02:47:57 2006
@@ -817,6 +817,17 @@
'LBL_STEP_2_2'=>'Step 2 of 2',
'LBL_FINISH_BUTTON'=>'Finish',
+
+//Added while moving Groups file from User to Setting Module
+'LBL_NEW_GROUP'=>'New Group',
+'LBL_GROUPS'=>'Groups',
+'LBL_GROUP_NAME'=>'Group Name',
+'LBL_ROLES_SUBORDINATES'=>'Roles and Subordinates',
+'LBL_MEMBER_AVLBL'=>'Available Entities & Members',
+'LBL_MEMBER_SELECTED'=>'Selected Members',
+'LBL_ENTITY'=>'Entity',
+'LBL_OF'=>'of',
+
);
Modified: vtigercrm/branches/5.0.3/modules/Users/DeleteGroup.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/DeleteGroup.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/DeleteGroup.php Wed Dec 13 02:47:57 2006
@@ -33,5 +33,5 @@
deleteGroup($del_id,$transferId,$transferType);
-header("Location: index.php?action=listgroups&module=Users&parenttab=Settings");
+header("Location: index.php?action=listgroups&module=Settings&parenttab=Settings");
?>
More information about the vtigercrm-commits
mailing list