From 7f0e44eaa9793de2fbe7377d92c0da693b625056 Mon Sep 17 00:00:00 2001 From: norahmollo Date: Thu, 11 Apr 2013 15:43:52 +0000 Subject: [PATCH] Hide columns ROLE_CODE and PERMISSION_CODE according to PARTNER_FLAG Task 919 - Sprint 3 --- workflow/engine/methods/roles/rolesUsersPermission.php | 2 +- workflow/engine/methods/roles/roles_List.php | 1 + workflow/engine/templates/roles/rolesList.js | 4 ++-- workflow/engine/templates/roles/rolesUsersPermission.js | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/workflow/engine/methods/roles/rolesUsersPermission.php b/workflow/engine/methods/roles/rolesUsersPermission.php index 021d7a9cf..5d07eecf9 100755 --- a/workflow/engine/methods/roles/rolesUsersPermission.php +++ b/workflow/engine/methods/roles/rolesUsersPermission.php @@ -49,7 +49,7 @@ $G_ID_SUB_MENU_SELECTED = 'ROLES'; $G_PUBLISH = new Publisher(); $oHeadPublisher = & headPublisher::getSingleton(); - +$oHeadPublisher->assign("PARTNER_FLAG", (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false); $oHeadPublisher->addExtJsScript( 'roles/rolesUsersPermission', false ); //adding a javascript file .js $oHeadPublisher->addContent( 'roles/rolesUsersPermission' ); //adding a html file .html. diff --git a/workflow/engine/methods/roles/roles_List.php b/workflow/engine/methods/roles/roles_List.php index 24d7e6b92..e668463c3 100755 --- a/workflow/engine/methods/roles/roles_List.php +++ b/workflow/engine/methods/roles/roles_List.php @@ -56,6 +56,7 @@ $oHeadPublisher = & headPublisher::getSingleton(); $oHeadPublisher->addExtJsScript( 'roles/rolesList', false ); //adding a javascript file .js $oHeadPublisher->addContent( 'roles/rolesList' ); //adding a html file .html. +$oHeadPublisher->assign( 'PARTNER_FLAG', (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false); $oHeadPublisher->assign( 'FORMATS', $c->getFormats() ); $oHeadPublisher->assign( 'CONFIG', $Config ); G::RenderPage( 'publish', 'extJs' ); diff --git a/workflow/engine/templates/roles/rolesList.js b/workflow/engine/templates/roles/rolesList.js index a740677e0..09ec787f3 100755 --- a/workflow/engine/templates/roles/rolesList.js +++ b/workflow/engine/templates/roles/rolesList.js @@ -172,7 +172,7 @@ Ext.onReady(function(){ frame: true, items:[ {xtype: 'textfield', name: 'rol_uid', hidden: true }, - {xtype: 'textfield', fieldLabel: _('ID_CODE'), name: 'code', width: 250, allowBlank: false, readOnly: true }, + {xtype: 'textfield', fieldLabel: _('ID_CODE'), name: 'code', width: 250, allowBlank: false, readOnly: true, hidden: !PARTNER_FLAG ? false : true}, {xtype: 'textfield', fieldLabel: _('ID_NAME'), name: 'name', width: 200, allowBlank: false}, { xtype: 'combo', @@ -239,7 +239,7 @@ Ext.onReady(function(){ }, columns: [ {id:'ROL_UID', dataIndex: 'ROL_UID', hidden:true, hideable:false}, - {header: _('ID_CODE'), dataIndex: 'ROL_CODE', width: 220, align:'left'}, + {header: _('ID_CODE'), dataIndex: 'ROL_CODE', width: 220, align:'left', hidden: !PARTNER_FLAG ? false : true}, {header: _('ID_NAME'), dataIndex: 'ROL_NAME', width: 180, hidden:false, align:'left'}, {header: _('ID_STATUS'), dataIndex: 'ROL_STATUS', width: 80, hidden: false, align: 'center', renderer: status_role}, {header: _('ID_ACTIVE_USERS'), dataIndex: 'TOTAL_USERS', width: 80, hidden: false, align: 'center'}, diff --git a/workflow/engine/templates/roles/rolesUsersPermission.js b/workflow/engine/templates/roles/rolesUsersPermission.js index ec81f7565..e0dc61ce2 100755 --- a/workflow/engine/templates/roles/rolesUsersPermission.js +++ b/workflow/engine/templates/roles/rolesUsersPermission.js @@ -139,7 +139,7 @@ Ext.onReady(function(){ }, columns: [ {id:'PER_UID', dataIndex: 'PER_UID', hidden:true, hideable:false}, - {header: _('ID_PERMISSION_CODE'), dataIndex: 'PER_CODE', width: 60, align:'left'}, + {header: _('ID_PERMISSION_CODE'), dataIndex: 'PER_CODE', width: 60, align:'left', hidden: !PARTNER_FLAG ? false : true}, {header: _('ID_PERMISSION_NAME'), dataIndex: 'PER_NAME', width: 60, align:'left'} ] });