Merge branch 'w26_MDL-17081_m26_roles2' of git://github.com/skodak/mo…

…odle
safatshahin · Jun 24, 2013 · 7f5c46d · 7f5c46d
2 parents 49eef7d + fcd75b6
commit 7f5c46d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 15 deletions.
diff --git a/admin/roles/classes/preset.php b/admin/roles/classes/preset.php
@@ -98,31 +98,33 @@ public static function get_export_xml($roleid) {
         $permissions = $dom->createElement('permissions');
         $top->appendChild($permissions);
 
-        $capabilities = $DB->get_records_sql(
-            "SELECT *
+        $capabilities = $DB->get_records_sql_menu(
+            "SELECT capability, permission
                FROM {role_capabilities}
               WHERE contextid = :syscontext AND roleid = :roleid
            ORDER BY capability ASC",
             array('syscontext'=>context_system::instance()->id, 'roleid'=>$roleid));
 
-        foreach ($capabilities as $cap) {
-            if ($cap->permission == CAP_INHERIT) {
-                $permissions->appendChild($dom->createElement('inherit', $cap->capability));
+        $allcapabilities = $DB->get_records('capabilities', array(), 'name ASC');
+        foreach ($allcapabilities as $cap) {
+            if (!isset($capabilities[$cap->name])) {
+                $permissions->appendChild($dom->createElement('inherit', $cap->name));
             }
         }
-        foreach ($capabilities as $cap) {
-            if ($cap->permission == CAP_ALLOW) {
-                $permissions->appendChild($dom->createElement('allow', $cap->capability));
+
+        foreach ($capabilities as $capability => $permission) {
+            if ($permission == CAP_ALLOW) {
+                $permissions->appendChild($dom->createElement('allow', $capability));
             }
         }
-        foreach ($capabilities as $cap) {
-            if ($cap->permission == CAP_PREVENT) {
-                $permissions->appendChild($dom->createElement('prevent', $cap->capability));
+        foreach ($capabilities as $capability => $permission) {
+            if ($permission == CAP_PREVENT) {
+                $permissions->appendChild($dom->createElement('prevent', $capability));
             }
         }
-        foreach ($capabilities as $cap) {
-            if ($cap->permission == CAP_PROHIBIT) {
-                $permissions->appendChild($dom->createElement('prohibit', $cap->capability));
+        foreach ($capabilities as $capability => $permission) {
+            if ($permission == CAP_PROHIBIT) {
+                $permissions->appendChild($dom->createElement('prohibit', $capability));
             }
         }
 

diff --git a/admin/roles/tests/preset_test.php b/admin/roles/tests/preset_test.php
@@ -63,9 +63,16 @@ public function test_xml() {
                ORDER BY capability ASC",
                 array('syscontext'=>context_system::instance()->id, 'roleid'=>$role->id));
 
-            $this->assertEquals(count($capabilities), count($info['permissions']));
             foreach ($capabilities as $cap) {
                 $this->assertEquals($cap->permission, $info['permissions'][$cap->capability]);
+                unset($info['permissions'][$cap->capability]);
+            }
+            // The remainders should be only inherits.
+            foreach ($info['permissions'] as $capability => $permission) {
+                if ($permission == CAP_INHERIT) {
+                    continue;
+                }
+                $this->fail('only CAP_INHERIT expected');
             }
         }
     }