[phpws-comm-commits] modules/article/class EditPermissions.php, 1.1, 1.2

[Eloi G. <ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/class
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11690/class

Modified Files:
	EditPermissions.php 
Log Message:
Group selector lists wil now not show if there aren't any groups

Index: EditPermissions.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/EditPermissions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EditPermissions.php	18 Nov 2008 05:00:13 -0000	1.1
--- EditPermissions.php	23 Nov 2008 06:07:51 -0000	1.2
***************
*** 139,172 ****
          $tags['VIEW_LABEL'] = dgettext('article', 'Viewing Restrictions');
          $tags['EDIT_LABEL'] = dgettext('article', 'Who Is Allowed To Edit');
-         $tags['VIEW_SELECT_LABEL'] = dgettext('article', 'Change Viewing Restrictions');
-         $tags['EDIT_SELECT_LABEL'] = dgettext('article', 'Change Who Is Allowed To Edit');
  
          $form = new PHPWS_Form('choose_permissions');
          $form->addHidden('module', 'article');
          $form->addHidden('op', 'edit_permissions');
          // View Permission option 3 --Group selection table
!         $view_group_hash = array_count_values($view_group_matchlist);
!         $form->mergeTemplate($this->create_form_columns($nonuser_groups, 'view', $view_group_hash, $article_count, 1));
  
          // View Permission fieldset
!         $form->addRadio('view_permission', array(0, 1, 2));
          $form->setExtra('view_permission', 'onclick="hideSelect(this.value)"');
!         $form->setLabel('view_permission', array(dgettext('users', 'All visitors'),
!                                                  dgettext('users', 'Logged visitors'),
!                                                  dgettext('users', 'Specific group(s)')));
          $form->setMatch('view_permission', $key->restricted);
  
          // Edit Permission table
!         // Get list of all groups/users that have restricted edit permissions
!         $edit_groups = $this->getRestrictedGrouplist($key->module, $key->edit_permission);
!         if (PHPWS_Error::logIfError($edit_groups)) 
!             return 'An error has occured.  Please ask an Administrator to check the error logs.';
!         // Create the group selection list
!         $edit_group_hash = array_count_values($edit_group_matchlist);
!         $form->mergeTemplate($this->create_form_columns($edit_groups, 'edit', $edit_group_hash, $article_count));
!         
!         $form->addCheckBox('change_view', 1);
!         $form->addCheckBox('change_edit', 1);
!         
          $form->addSubmit('submit', dgettext('article', 'Save Changes'));
          $form->addSubmit('cancel', dgettext('article', 'Cancel'));
--- 139,175 ----
          $tags['VIEW_LABEL'] = dgettext('article', 'Viewing Restrictions');
          $tags['EDIT_LABEL'] = dgettext('article', 'Who Is Allowed To Edit');
  
          $form = new PHPWS_Form('choose_permissions');
          $form->addHidden('module', 'article');
          $form->addHidden('op', 'edit_permissions');
+         $view_opts = array(dgettext('users', 'All visitors'), dgettext('users', 'Logged visitors'));
          // View Permission option 3 --Group selection table
!         if (!empty($view_group_matchlist)) {
!             $view_group_hash = array_count_values($view_group_matchlist);
!             $form->mergeTemplate($this->create_form_columns($nonuser_groups, 'view', $view_group_hash, $article_count, 1));
!             $view_opts[] = dgettext('users', 'Specific group(s)');
!         }
  
          // View Permission fieldset
!         $form->addRadio('view_permission', array_keys($view_opts));
          $form->setExtra('view_permission', 'onclick="hideSelect(this.value)"');
!         $form->setLabel('view_permission', $view_opts);
          $form->setMatch('view_permission', $key->restricted);
+         $form->addCheckBox('change_view', 1);
+         $form->addTplTag('VIEW_SELECT_LABEL', dgettext('article', 'Change Viewing Restrictions'));
  
          // Edit Permission table
!         if (!empty($edit_group_matchlist)) {
!             // Get list of all groups/users that have restricted edit permissions
!             $edit_groups = $this->getRestrictedGrouplist($key->module, $key->edit_permission);
!             if (PHPWS_Error::logIfError($edit_groups)) 
!                 return 'An error has occured.  Please ask an Administrator to check the error logs.';
!             // Create the group selection list
!             $edit_group_hash = array_count_values($edit_group_matchlist);
!             $form->mergeTemplate($this->create_form_columns($edit_groups, 'edit', $edit_group_hash, $article_count));
!             $form->addCheckBox('change_edit', 1);
!             $form->addTplTag('EDIT_SELECT_LABEL', dgettext('article', 'Change Who Is Allowed To Edit'));
!         }
! 
          $form->addSubmit('submit', dgettext('article', 'Save Changes'));
          $form->addSubmit('cancel', dgettext('article', 'Cancel'));