From e095534648125ac535b910046b97780265ad086e Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 13 Jun 2015 01:20:45 -0400 Subject: [PATCH] #196 Can now output permission groups --- admin/manage_permission_templates.php | 40 ++++++++++++++++++++++----- css/hesk_newStyle.php | 12 ++++++++ css/hesk_newStyleRTL.php | 12 ++++++++ language/en/text.php | 4 +++ 4 files changed, 61 insertions(+), 7 deletions(-) diff --git a/admin/manage_permission_templates.php b/admin/manage_permission_templates.php index 785cd2e6..d50a5471 100644 --- a/admin/manage_permission_templates.php +++ b/admin/manage_permission_templates.php @@ -46,6 +46,7 @@ hesk_dbConnect(); hesk_isLoggedIn(); /* Check permissions for this feature */ +//TODO Create and use new permission here hesk_checkPermission('can_man_cat'); /* What should we do? */ @@ -73,16 +74,36 @@ else {return false;} '.$mycat['name'].''; - } + $featureArray = hesk_getFeatureArray(); ?>
+

+
+ + + + + + + + + + + + + + + +
+ + + +
+
@@ -92,5 +113,10 @@ exit(); /*** START FUNCTIONS ***/ +function getNumberOfUsersWithPermissionGroup($templateId) { + global $hesk_settings; + $res = hesk_dbQuery("SELECT 1 FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."users` WHERE `permission_template` = ".intval($templateId)); + return hesk_dbNumRows($res); +} ?> diff --git a/css/hesk_newStyle.php b/css/hesk_newStyle.php index 236d8b28..b99c14f2 100644 --- a/css/hesk_newStyle.php +++ b/css/hesk_newStyle.php @@ -383,4 +383,16 @@ button.dropdown-submit { .default-row-margins { margin: 0 -15px; +} + +.icon-link { + font-size: 16px !important; +} + +.orange { + color: orange; +} + +.red { + color: #FF0000; } \ No newline at end of file diff --git a/css/hesk_newStyleRTL.php b/css/hesk_newStyleRTL.php index 5355d765..b1951159 100644 --- a/css/hesk_newStyleRTL.php +++ b/css/hesk_newStyleRTL.php @@ -377,4 +377,16 @@ button.dropdown-submit { .default-row-margins { margin: 0 -15px; +} + +.icon-link { + font-size: 16px; +} + +.orange { + color: orange; +} + +.red { + color: #FF0000; } \ No newline at end of file diff --git a/language/en/text.php b/language/en/text.php index 9614ffd2..08b1581a 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -70,6 +70,10 @@ $hesklang['manager'] = 'Manager'; $hesklang['manager_updated'] = 'Category manager has been updated.'; $hesklang['can_set_manager'] = 'Can set category managers'; $hesklang['no_manager'] = 'No manager'; +$hesklang['manage_permission_templates'] = 'Manage Permission Templates'; +$hesklang['number_of_users'] = 'Number of Users'; +$hesklang['actions'] = 'Actions'; +$hesklang['view_permissions_for_this_template'] = 'View permissions for this template'; // ADDED OR MODIFIED IN Mods for HESK 2.2.1 $hesklang['popart_no_colon']='Top Knowledgebase Articles'; // same as $hesklang['popart'] but without a colon (:)