Commit e8a5ef18 authored by Stefan Ruijsenaars's avatar Stefan Ruijsenaars
Browse files

Issue #2127881 by bdeclerc: New module: Custom Permissions... 

 Issue #2127881 by bdeclerc: New module: Custom Permissions (Builder/Configurator roles should be able to edit Site Information) - reverting changes
parent ffa38f53

CHANGELOG.txt

+0 −1
Changes for CHANGELOG.txt: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ TBD - Version 7.x 
    #2120401: New module: Smart Trim

    #2076051: New module: Honeypot

    #2122259: New module: Recaptcha

    #2127881: New module: Custom permissions



  * Upgraded modules:

    #2123477: Module upgrade: rules

drupal-org.make

+0 −5
Changes for drupal-org.make: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -126,11 +126,6 @@ projects[colorbox][subdir] = contrib 
projects[comment_goodness][version] = "1.4"

projects[comment_goodness][subdir] = contrib



projects[config_perms][download][type] = git

projects[config_perms][download][branch] = "7.x-2.x"

projects[config_perms][download][revision] = 0953b4b

projects[config_perms][subdir] = contrib



projects[content_access][version] = "1.2-beta2"

projects[content_access][subdir] = contrib

includes/misc/openfed_functions.inc

+0 −12
Changes for includes/misc/openfed_functions.inc: 0 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -308,12 +308,6 @@ function _openfed_get_default_permissions() { 
      'Configurator',

    ),



    // config_perms

    'administer site information' => array(

      'Builder',

      'Configurator',

    ),   



    // contextual

    'access contextual links' => array(

      'Builder',
@@ -690,12 +684,6 @@ function _openfed_get_default_permissions() { 
      'Content Manager',

    ),



    // ofed_cms_theme

    'edit site information' => array(

      'Builder',

      'Configurator',

    ),



    // ofed_vmcd

    'administer views multi-column display' => array(

      'Builder',

openfed.install

+0 −24
Changes for openfed.install: 0 added lines, 24 removed lines.
Original line number Diff line number Diff line
@@ -327,27 +327,3 @@ function openfed_update_7108() { 
  variable_set('page_cache_invoke_hooks', TRUE);

  module_disable(array('locale_cookie'), FALSE);

}
 


/**

 * Fix #2127881: Builder/Configurator roles should be able to edit Site

 * Information.

 */

function openfed_update_7109() {

  if (!module_exists('config_perms')) {

    module_enable(array('config_perms'));

  }

  $roles = array(

    'Builder',

    'Configurator',

  );

  $permissions = array('administer site information');



  foreach ($roles as $role_name) {

    $role = user_role_load_by_name($role_name);



    if (!empty($role->rid)) {

      // Assign permission to role.

      user_role_grant_permissions($role->rid, $permissions);

    }

  }

}