Index: trunk/core/admin_templates/groups/groups_edit_permissions.tpl =================================================================== diff -u -r4607 -r4610 --- trunk/core/admin_templates/groups/groups_edit_permissions.tpl (.../groups_edit_permissions.tpl) (revision 4607) +++ trunk/core/admin_templates/groups/groups_edit_permissions.tpl (.../groups_edit_permissions.tpl) (revision 4610) @@ -100,7 +100,7 @@ - ', 'PermList');"> + ', 'PermList', null, 'OnSavePermissions');"> Index: trunk/kernel/admin_templates/groups/permissions_selector.tpl =================================================================== diff -u --- trunk/kernel/admin_templates/groups/permissions_selector.tpl (revision 0) +++ trunk/kernel/admin_templates/groups/permissions_selector.tpl (revision 4610) @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + "> + + . + + + [][]" name="[][]" value=""> + [][]" name="_cb_[][]" checked onchange="update_checkbox(this, document.getElementById('[][]'));"> + + + + + + + + + + + + + + + + + +

+ + \ No newline at end of file Index: trunk/kernel/admin_templates/groups/groups_edit_permissions.tpl =================================================================== diff -u -r4607 -r4610 --- trunk/kernel/admin_templates/groups/groups_edit_permissions.tpl (.../groups_edit_permissions.tpl) (revision 4607) +++ trunk/kernel/admin_templates/groups/groups_edit_permissions.tpl (.../groups_edit_permissions.tpl) (revision 4610) @@ -100,7 +100,7 @@ - ', 'PermList');"> + ', 'PermList', null, 'OnSavePermissions');"> Index: trunk/kernel/admin_templates/incs/script.js =================================================================== diff -u -r4596 -r4610 --- trunk/kernel/admin_templates/incs/script.js (.../script.js) (revision 4596) +++ trunk/kernel/admin_templates/incs/script.js (.../script.js) (revision 4610) @@ -299,36 +299,40 @@ function PreSaveAndOpenTranslator(prefix,field,t,multi_line,$width,$height) { + var $kf = document.getElementById($form_name); + if(!isset($window_name)) var $window_name = 'select_'+t.replace(/(\/|-)/g, '_'); if(!isset($width)) $width=750; if(!isset($height)) $height=400; if(!isset(multi_line)) multi_line=0; openwin('',$window_name,$width,$height); - set_hidden_field('return_template', document.kernel_form.elements['t'].value); // where should return after popup is done + set_hidden_field('return_template', $kf.elements['t'].value); // where should return after popup is done set_hidden_field('translator_wnd_name', $window_name); set_hidden_field('translator_field', field); set_hidden_field('translator_t', t); set_hidden_field('translator_prefixes', prefix); set_hidden_field('translator_multi_line', multi_line); - document.kernel_form.target=$window_name; + $kf.target = $window_name; var split_prefix = prefix.split(','); submit_event(split_prefix[0],'OnPreSaveAndOpenTranslator'); } function PreSaveAndOpenTranslatorCV(prefix,field,t,resource_id,multi_line) { + var $kf = document.getElementById($form_name); + if(!isset($window_name)) var $window_name = 'select_'+t.replace(/(\/|-)/g, '_'); if(!isset(multi_line)) multi_line=0; openwin('',$window_name,750,400); - set_hidden_field('return_template', document.kernel_form.elements['t'].value); // where should return after popup is done + set_hidden_field('return_template', $kf.elements['t'].value); // where should return after popup is done set_hidden_field('translator_wnd_name', $window_name); set_hidden_field('translator_field', field); set_hidden_field('translator_t', t); set_hidden_field('translator_prefixes', prefix); set_hidden_field('translator_resource_id', resource_id); set_hidden_field('translator_multi_line', multi_line); - document.kernel_form.target = $window_name; + $kf.target = $window_name; var split_prefix = prefix.split(','); submit_event(split_prefix[0],'OnPreSaveAndOpenTranslator'); @@ -337,13 +341,15 @@ function openTranslator(prefix,field,url,wnd) { + var $kf = document.getElementById($form_name); + set_hidden_field('trans_prefix', prefix); set_hidden_field('trans_field', field); set_hidden_field('events[trans]', 'OnLoad'); var $regex = new RegExp('(.*)\?env=' + document.getElementById('sid').value + '-(.*?):(.*)'); var $t = $regex.exec(url)[2]; - document.kernel_form.target = wnd; + $kf.target = wnd; submit_event(prefix,'',$t,url); } @@ -353,7 +359,7 @@ var $regex = new RegExp('(.*)\?env=' + document.getElementById('sid').value + '-(.*?):(.*)'); var $t = $regex.exec($url)[2]; var $window_name = 'select_'+$t.replace(/(\/|-)/g, '_'); - + if (!isset($window_size)) $window_size = '750x400'; $window_size = $window_size.split('x'); @@ -370,9 +376,9 @@ set_hidden_field('return_template', $kf.elements['t'].value); // where should return after popup is done openwin('',$window_name,$window_size[0],$window_size[1]); - document.kernel_form.action = $url; - document.kernel_form.target = $window_name; - + $kf.action = $url; + $kf.target = $window_name; + submit_event($prefix, $event, $t); processHooks('openSelector', hAFTER); Index: trunk/core/admin_templates/groups/permissions_selector.tpl =================================================================== diff -u --- trunk/core/admin_templates/groups/permissions_selector.tpl (revision 0) +++ trunk/core/admin_templates/groups/permissions_selector.tpl (revision 4610) @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + "> + + . + + + [][]" name="[][]" value=""> + [][]" name="_cb_[][]" checked onchange="update_checkbox(this, document.getElementById('[][]'));"> + + + + + + + + + + + + + + + + + +

+ + \ No newline at end of file Index: trunk/core/units/groups/groups_config.php =================================================================== diff -u -r4607 -r4610 --- trunk/core/units/groups/groups_config.php (.../groups_config.php) (revision 4607) +++ trunk/core/units/groups/groups_config.php (.../groups_config.php) (revision 4610) @@ -37,6 +37,8 @@ 'groups_edit_permissions' => Array('prefixes' => Array('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Permissions!" ), + 'groups_edit_additional_permissions' => Array('prefixes' => Array('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_AdditionalPermissions!" ), + 'groups_select' => Array('prefixes' => Array('g_List'), 'format' => "!la_title_Groups! (#g_recordcount#) - !la_title_SelectGroup!"), ), Index: trunk/core/kernel/db/db_event_handler.php =================================================================== diff -u -r4528 -r4610 --- trunk/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 4528) +++ trunk/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 4610) @@ -1314,7 +1314,7 @@ $new_level = 'index4.php|'.ltrim($this->Application->BuildEnv($t, $redirect_params, 'all', $pass_events), ENV_VAR_NAME.'='); array_push($opener_stack, $new_level); - $this->Application->StoreVar('opener_stack',serialize($opener_stack)); + $this->Application->StoreVar('opener_stack', serialize($opener_stack)); } /** Index: trunk/kernel/units/groups/groups_config.php =================================================================== diff -u -r4607 -r4610 --- trunk/kernel/units/groups/groups_config.php (.../groups_config.php) (revision 4607) +++ trunk/kernel/units/groups/groups_config.php (.../groups_config.php) (revision 4610) @@ -37,6 +37,8 @@ 'groups_edit_permissions' => Array('prefixes' => Array('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Permissions!" ), + 'groups_edit_additional_permissions' => Array('prefixes' => Array('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_AdditionalPermissions!" ), + 'groups_select' => Array('prefixes' => Array('g_List'), 'format' => "!la_title_Groups! (#g_recordcount#) - !la_title_SelectGroup!"), ), Index: trunk/kernel/units/admin/admin_tag_processor.php =================================================================== diff -u -r4607 -r4610 --- trunk/kernel/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 4607) +++ trunk/kernel/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 4610) @@ -263,9 +263,12 @@ function ListSectionPermissions($params) { - $section_data =& $this->Tree[ $params['section_name'] ]; - $block_params = array_merge_recursive2($section_data, Array('name' => $params['render_as'])); + $section_name = isset($params['section_name']) ? $params['section_name'] : $this->Application->GetVar('section_name'); + $sections_helper =& $this->Application->recallObject('SectionsHelper'); + $section_data =& $sections_helper->getSectionData($section_name); + $block_params = array_merge_recursive2($section_data, Array('name' => $params['render_as'], 'section_name' => $section_name)); + $ret = ''; foreach ($section_data['permissions'] as $perm_name) { if (preg_match('/^advanced:(.*)/', $perm_name) != $params['type']) continue; Index: trunk/core/units/admin/admin_tag_processor.php =================================================================== diff -u -r4607 -r4610 --- trunk/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 4607) +++ trunk/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 4610) @@ -263,9 +263,12 @@ function ListSectionPermissions($params) { - $section_data =& $this->Tree[ $params['section_name'] ]; - $block_params = array_merge_recursive2($section_data, Array('name' => $params['render_as'])); + $section_name = isset($params['section_name']) ? $params['section_name'] : $this->Application->GetVar('section_name'); + $sections_helper =& $this->Application->recallObject('SectionsHelper'); + $section_data =& $sections_helper->getSectionData($section_name); + $block_params = array_merge_recursive2($section_data, Array('name' => $params['render_as'], 'section_name' => $section_name)); + $ret = ''; foreach ($section_data['permissions'] as $perm_name) { if (preg_match('/^advanced:(.*)/', $perm_name) != $params['type']) continue; Index: trunk/kernel/admin_templates/incs/blocks.tpl =================================================================== diff -u -r4330 -r4610 --- trunk/kernel/admin_templates/incs/blocks.tpl (.../blocks.tpl) (revision 4330) +++ trunk/kernel/admin_templates/incs/blocks.tpl (.../blocks.tpl) (revision 4610) @@ -5,7 +5,7 @@ -