Skip to content

Commit

Permalink
Added new action - CreateView
Browse files Browse the repository at this point in the history
  • Loading branch information
@TomaszQr
TomaszQr committed Mar 14, 2016
1 parent 66e7406 commit 80b5d75
Show file tree
Hide file tree
Showing 42 changed files with 360 additions and 68 deletions.
2 changes: 1 addition & 1 deletion config/version.php
View file
Expand Up @@ -9,5 +9,5 @@
* Contributor(s): YetiForce.com
* ****************************************************************************** */
$patch_version = '20160314';
$YetiForce_current_version = '2.3.1473';
$YetiForce_current_version = '2.3.1474';
$_SESSION['yetiforce_version'] = $YetiForce_current_version;
256 changes: 254 additions & 2 deletions install/install_schema/data.sql
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion languages/de_de/Settings/Profiles.php
View file
Expand Up @@ -21,7 +21,8 @@
'LBL_EDIT_ALL_DESC' => 'Kann alle Modul Informationen bearbeiten',
'LBL_EDIT_ALL' => 'Alle bearbeiten',
'LBL_EDIT_PRIVILIGES_FOR_THIS_PROFILE' => 'Berechtigungen für dieses Profil bearbeiten',
'LBL_EDIT_PRIVILIGE' => 'Erstellen / Bearbeiten',
'LBL_EDIT_PRIVILIGE' => 'Bearbeiten',
'LBL_CREATE_PRIVILIGE' => 'Erstellen',
'LBL_EDIT_RECORD' => 'Bearbeiten',
'LBL_FIELD_AND_TOOL_PRVILIGES' => 'Berechtigungen für Felder und Werkzeuge',
'LBL_FIELDS' => 'Felder',
Expand Down
3 changes: 2 additions & 1 deletion languages/en_us/Settings/Profiles.php
View file
Expand Up @@ -21,7 +21,8 @@
'LBL_EDIT_ALL_DESC' => 'Can edit all the module\'s information',
'LBL_EDIT_ALL' => 'Edit all',
'LBL_EDIT_PRIVILIGES_FOR_THIS_PROFILE' => 'Edit privileges for this profile',
'LBL_EDIT_PRIVILIGE' => 'Create/Edit',
'LBL_EDIT_PRIVILIGE' => 'Edit',
'LBL_CREATE_PRIVILIGE' => 'Create',
'LBL_EDIT_RECORD' => 'Edit',
'LBL_FIELD_AND_TOOL_PRVILIGES' => 'Field and tool privileges',
'LBL_FIELDS' => 'Fields',
Expand Down
3 changes: 2 additions & 1 deletion languages/pl_pl/Settings/Profiles.php
View file
Expand Up @@ -22,7 +22,8 @@
'LBL_EDIT_PRIVILIGES_FOR_THIS_PROFILE' => 'Edytuj uprawnienia do profilu',
'LBL_EDIT_ALL_DESC' => 'Po zaznaczeniu tej opcji wszystkie moduły będą miały włączoną opcję: Tworzenie/Edycja.',
'LBL_EDIT_ALL' => ' Edycja wszystkich modułów',
'LBL_EDIT_PRIVILIGE' => 'Tworzenie/Edycja',
'LBL_EDIT_PRIVILIGE' => 'Edycja',
'LBL_CREATE_PRIVILIGE' => 'Tworzenie',
'LBL_EDIT_RECORD' => 'Edytuj',
'LBL_FIELD_AND_TOOL_PRVILIGES' => 'Uprawnienia do pól i narzędzi',
'LBL_FIELDS' => 'Pola',
Expand Down
3 changes: 2 additions & 1 deletion languages/pt_br/Settings/Profiles.php
View file
Expand Up @@ -21,7 +21,8 @@
'LBL_EDIT_ALL_DESC' => 'Permite editar todas as informações dos módulos',
'LBL_EDIT_ALL' => 'Editar Tudo',
'LBL_EDIT_PRIVILIGES_FOR_THIS_PROFILE' => 'Editar privilégios para este Perfil',
'LBL_EDIT_PRIVILIGE' => 'Criar/Editar',
'LBL_EDIT_PRIVILIGE' => 'Editar',
'LBL_CREATE_PRIVILIGE' => 'Criar',
'LBL_EDIT_RECORD' => 'Editar',
'LBL_FIELD_AND_TOOL_PRVILIGES' => 'Privilégios para Campos e Ferramentas',
'LBL_FIELDS' => 'Campos',
Expand Down
3 changes: 2 additions & 1 deletion languages/ru_ru/Settings/Profiles.php
View file
Expand Up @@ -22,7 +22,8 @@
'LBL_EDIT_ALL_DESC' => 'Разрешено редактировать все данные модуля',
'LBL_EDIT_ALL' => 'Редактировать все',
'LBL_EDIT_PRIVILIGES_FOR_THIS_PROFILE' => 'Редактировать привилегии для данного профиля',
'LBL_EDIT_PRIVILIGE' => 'Создавать Редактировать',
'LBL_EDIT_PRIVILIGE' => 'Редактировать',
'LBL_CREATE_PRIVILIGE' => 'Создавать',
'LBL_EDIT_RECORD' => 'Редактировать',
'LBL_FIELD_AND_TOOL_PRVILIGES' => 'Привилегии для полей и инструментов',
'LBL_FIELDS' => 'Поля',
Expand Down
2 changes: 1 addition & 1 deletion layouts/basic/modules/Assets/dashboards/ExpiringSoldProducts.tpl
View file
Expand Up @@ -16,7 +16,7 @@
</div>
<div class="col-md-4">
<div class="box pull-right">
{if Users_Privileges_Model::isPermitted($MODULE_NAME, 'EditView')}
{if Users_Privileges_Model::isPermitted($MODULE_NAME, 'CreateView')}
<a class="btn btn-default btn-xs" onclick="Vtiger_Header_Js.getInstance().quickCreateModule('{$MODULE_NAME}'); return false;">
<i class='glyphicon glyphicon-plus' border='0' title="{vtranslate('LBL_ADD_RECORD')}" alt="{vtranslate('LBL_ADD_RECORD')}"/>
</a>
Expand Down
6 changes: 3 additions & 3 deletions layouts/basic/modules/OSSMail/MailActionBarRow.tpl
View file
Expand Up @@ -8,17 +8,17 @@
</span>
</a>
<div class="pull-right rowActions">
{if Users_Privileges_Model::isPermitted('Calendar','EditView')}
{if Users_Privileges_Model::isPermitted('Calendar','CreateView')}
<button class="addReletedRecord" data-module="Calendar" title="{vtranslate('LBL_ADD_CALENDAR',$MODULE_NAME)}">
<span class="userIcon-Calendar" aria-hidden="true"></span>
</button>
{/if}
{if Users_Privileges_Model::isPermitted('ModComments','EditView')}
{if Users_Privileges_Model::isPermitted('ModComments','CreateView')}
<button class="addReletedRecord" data-module="ModComments" title="{vtranslate('LBL_ADD_MODCOMMENTS',$MODULE_NAME)}">
<span class="glyphicon glyphicon-comment" aria-hidden="true"></span>
</button>
{/if}
{if in_array($RELETED['module'], ['HelpDesk','Project']) && Users_Privileges_Model::isPermitted('HelpDesk','EditView')}
{if in_array($RELETED['module'], ['HelpDesk','Project']) && Users_Privileges_Model::isPermitted('HelpDesk','CreateView')}
<button class="addReletedRecord" data-module="HelpDesk" title="{vtranslate('LBL_ADD_HELPDESK',$MODULE_NAME)}">
<span class="userIcon-HelpDesk" aria-hidden="true"></span>
</button>
Expand Down
2 changes: 1 addition & 1 deletion layouts/basic/modules/OSSTimeControl/dashboards/TimeControl.tpl
View file
Expand Up @@ -63,7 +63,7 @@
</div>
<div class="col-md-4">
<div class="box pull-right">
{if Users_Privileges_Model::isPermitted('OSSTimeControl', 'EditView')}
{if Users_Privileges_Model::isPermitted('OSSTimeControl', 'CreateView')}
<a class="btn btn-xs btn-default" onclick="Vtiger_Header_Js.getInstance().quickCreateModule('OSSTimeControl'); return false;">
<span class='glyphicon glyphicon-plus' border='0' title="{vtranslate('LBL_ADD_RECORD')}" alt="{vtranslate('LBL_ADD_RECORD')}"></span>
</a>
Expand Down
10 changes: 6 additions & 4 deletions layouts/basic/modules/Settings/Profiles/DetailView.tpl
View file
Expand Up @@ -58,20 +58,22 @@
</div>
<table class="table customTableRWD table-striped table-bordered">
<thead>

<tr>
<th width="27%" style="border-left: 1px solid #DDD !important;">
{vtranslate('LBL_MODULES', $QUALIFIED_MODULE)}
</th>
<th data-hide="phone" width="11%" style="border-left: 1px solid #DDD !important;">
<span class="horizontalAlignCenter">

&nbsp;{'LBL_VIEW_PRIVILEGE'|vtranslate:$QUALIFIED_MODULE}
</span>
</th>
<th data-hide="phone" width="12%" style="border-left: 1px solid #DDD !important;">
<span class="horizontalAlignCenter" >

&nbsp;{'LBL_CREATE_PRIVILIGE'|vtranslate:$QUALIFIED_MODULE}
</span>
</th>
<th data-hide="phone" width="12%" style="border-left: 1px solid #DDD !important;">
<span class="horizontalAlignCenter" >
&nbsp;{'LBL_EDIT_PRIVILIGE'|vtranslate:$QUALIFIED_MODULE}
</span>
</th>
Expand All @@ -88,7 +90,7 @@
<td>
<img src="{if $RECORD_MODEL->hasModulePermission($PROFILE_MODULE)}{$ENABLE_IMAGE_PATH}{else}{$DISABLE_IMAGE_PATH}{/if}" class="alignMiddle" />&nbsp;{$PROFILE_MODULE->get('label')|vtranslate:$PROFILE_MODULE->getName()}
</td>
{assign var="BASIC_ACTION_ORDER" value=array(2,0,1)}
{assign var="BASIC_ACTION_ORDER" value=array(2,3,0,1)}
{foreach from=$BASIC_ACTION_ORDER item=ACTION_ID}
<td style="border-left: 1px solid #DDD !important;">
{assign var="ACTION_MODEL" value=$ALL_BASIC_ACTIONS[$ACTION_ID]}
Expand Down
6 changes: 5 additions & 1 deletion layouts/basic/modules/Settings/Profiles/EditView.tpl
View file
Expand Up @@ -57,6 +57,10 @@
<input {if empty($RECORD_ID) && empty($IS_DUPLICATE_RECORD)} class="alignTop" checked="true" {/if} type="checkbox" id="mainAction4CheckBox" />&nbsp;
{'LBL_VIEW_PRIVILEGE'|vtranslate:$QUALIFIED_MODULE}
</th>
<th data-hide='phone' width="14%" style="border-left: 1px solid #DDD !important;">
<input {if empty($RECORD_ID) && empty($IS_DUPLICATE_RECORD)} class="alignTop" checked="true"{/if} type="checkbox" id="mainAction7CheckBox" />&nbsp;
{'LBL_CREATE_PRIVILIGE'|vtranslate:$QUALIFIED_MODULE}
</th>
<th data-hide='phone' width="14%" style="border-left: 1px solid #DDD !important;">
<input {if empty($RECORD_ID) && empty($IS_DUPLICATE_RECORD)} class="alignTop" checked="true"{/if} type="checkbox" id="mainAction1CheckBox" />&nbsp;
{'LBL_EDIT_PRIVILIGE'|vtranslate:$QUALIFIED_MODULE}
Expand All @@ -78,7 +82,7 @@
<td>
<input class="modulesCheckBox alignTop" type="checkbox" name="permissions[{$TABID}][is_permitted]" data-value="{$TABID}" data-module-state="" {if $RECORD_MODEL->hasModulePermission($PROFILE_MODULE)}checked="true"{else} data-module-unchecked="true" {/if}> {$PROFILE_MODULE->get('label')|vtranslate:$PROFILE_MODULE->getName()}
</td>
{assign var="BASIC_ACTION_ORDER" value=array(2,0,1)}
{assign var="BASIC_ACTION_ORDER" value=array(2,3,0,1)}
{foreach from=$BASIC_ACTION_ORDER item=ORDERID}
<td style="border-left: 1px solid #DDD !important;">
{assign var="ACTION_MODEL" value=$ALL_BASIC_ACTIONS[$ORDERID]}
Expand Down
51 changes: 35 additions & 16 deletions layouts/basic/modules/Settings/Profiles/resources/Profiles.js
View file
Expand Up @@ -93,7 +93,7 @@ var Settings_Profiles_Js = {

jQuery('[data-module-state]').change(handleModuleSelectionState);
jQuery('[data-action-state]').change(handleActionSelectionState);
jQuery('#mainAction1CheckBox,#mainAction2CheckBox').change(selectAllModulesViewAndToolPriviliges);
jQuery('#mainAction1CheckBox,#mainAction2CheckBox, #mainAction7CheckBox').change(selectAllModulesViewAndToolPriviliges);

jQuery('[data-togglehandler]').click(toggleEditViewTableRow);
jQuery('[data-range]').each(function(index, item) {
Expand All @@ -116,31 +116,35 @@ var Settings_Profiles_Js = {
registerSelectAllModulesEvent : function() {
var moduleCheckBoxes = jQuery('.modulesCheckBox');
var viewAction = jQuery('#mainAction4CheckBox');
var createAction = jQuery('#mainAction1CheckBox');
var deleteACtion = jQuery('#mainAction2CheckBox');
var editAction = jQuery('#mainAction1CheckBox');
var deleteAction = jQuery('#mainAction2CheckBox');
var createAction = jQuery('#mainAction7CheckBox');
var mainModulesCheckBox = jQuery('#mainModulesCheckBox');
mainModulesCheckBox.on('change',function(e) {
var mainCheckBox = jQuery(e.currentTarget);
if(mainCheckBox.is(':checked')){
moduleCheckBoxes.attr('checked',true);
viewAction.attr('checked',true);
editAction.show().attr('checked',true);
deleteAction.show().attr('checked',true);
createAction.show().attr('checked',true);
deleteACtion.show().attr('checked',true);
moduleCheckBoxes.trigger('change');
} else {
moduleCheckBoxes.attr('checked',false);
moduleCheckBoxes.trigger('change');
viewAction.attr('checked',false);
editAction.attr('checked', false);
deleteAction.attr('checked', false);
createAction.attr('checked', false);
deleteACtion.attr('checked', false);
}
});

moduleCheckBoxes.on('change',function(){
Settings_Profiles_Js.checkSelectAll(moduleCheckBoxes,mainModulesCheckBox);
Settings_Profiles_Js.checkSelectAll(jQuery('.action4CheckBox'),viewAction);
Settings_Profiles_Js.checkSelectAll(jQuery('.action1CheckBox'),createAction);
Settings_Profiles_Js.checkSelectAll(jQuery('.action2CheckBox'),deleteACtion);
Settings_Profiles_Js.checkSelectAll(jQuery('.action1CheckBox'),editAction);
Settings_Profiles_Js.checkSelectAll(jQuery('.action2CheckBox'),deleteAction);
Settings_Profiles_Js.checkSelectAll(jQuery('.action7CheckBox'),createAction);
});
},

Expand All @@ -166,19 +170,19 @@ var Settings_Profiles_Js = {

},

registerSelectAllCreateActionsEvent : function() {
var createActionCheckBoxes = jQuery('.action1CheckBox');
var mainCreateActionCheckBox = jQuery('#mainAction1CheckBox');
mainCreateActionCheckBox.on('change',function(e){
registerSelectAllEditActionsEvent : function() {
var editActionCheckBoxes = jQuery('.action1CheckBox');
var mainEditActionCheckBox = jQuery('#mainAction1CheckBox');
mainEditActionCheckBox.on('change',function(e){
var mainCheckBox = jQuery(e.currentTarget);
if(mainCheckBox.is(':checked')){
createActionCheckBoxes.attr('checked',true);
editActionCheckBoxes.attr('checked',true);
} else {
createActionCheckBoxes.attr('checked',false);
editActionCheckBoxes.attr('checked',false);
}
});
createActionCheckBoxes.on('change',function() {
Settings_Profiles_Js.checkSelectAll(createActionCheckBoxes,mainCreateActionCheckBox);
mainEditActionCheckBox.on('change',function() {
Settings_Profiles_Js.checkSelectAll(editActionCheckBoxes,mainEditActionCheckBox);
});

},
Expand All @@ -198,7 +202,21 @@ var Settings_Profiles_Js = {
Settings_Profiles_Js.checkSelectAll(deleteActionCheckBoxes,mainDeleteActionCheckBox);
});
},

registerSelectAllCreateActionsEvent : function() {
var createActionCheckBoxes = jQuery('.action7CheckBox');
var mainCreateActionCheckBox = jQuery('#mainAction7CheckBox');
mainCreateActionCheckBox.on('change',function(e){
var mainCheckBox = jQuery(e.currentTarget);
if(mainCheckBox.is(':checked')){
createActionCheckBoxes.attr('checked',true);
} else {
createActionCheckBoxes.attr('checked',false);
}
});
createActionCheckBoxes.on('change',function() {
Settings_Profiles_Js.checkSelectAll(createActionCheckBoxes,mainCreateActionCheckBox);
});
},
checkSelectAll : function(checkBoxElement,mainCheckBoxElement){
var state = true;
if(typeof checkBoxElement == 'undefined' || typeof mainCheckBoxElement == 'undefined'){
Expand Down Expand Up @@ -356,6 +374,7 @@ var Settings_Profiles_Js = {
Settings_Profiles_Js.registerSelectAllModulesEvent();
Settings_Profiles_Js.registerSelectAllViewActionsEvent();
Settings_Profiles_Js.registerSelectAllCreateActionsEvent();
Settings_Profiles_Js.registerSelectAllEditActionsEvent();
Settings_Profiles_Js.registerSelectAllDeleteActionsEvent();
Settings_Profiles_Js.performSelectAllActionsOnLoad();
Settings_Profiles_Js.registerSubmitEvent();
Expand Down

0 comments on commit 80b5d75

Please sign in to comment.