Changeset 3080

Timestamp:

10/01/08 02:15:24 (14 months ago)

Author:

fumiakiy

Message:

Removed unnecessary upgrade functions. System- and blog-level permissions can now share the same name, and system-level permission works as expected; it works globally to any blog in the system for the blog level permission of the same name. BugId:82202, BugId:80106, BugId:81658

Location:

branches/fireball/lib/MT

Files:

• Permission.pm (modified) (2 diffs)
• Upgrade.pm (modified) (1 diff)

branches/fireball/lib/MT/Permission.pm

@@ -85 +85 @@
 }
 
+sub global_perms {
+    my $perm = shift;
+
+    return undef unless $perm->author_id;
+    return $perm unless $perm->blog_id;
+
+    $perm->cache_property(
+        'global_perms',
+        sub {
+            __PACKAGE__->load( { author_id => $perm->author_id, blog_id => 0 });
+        }
+    );
+}
+
 # Legend:
 # author_id || blog_id || permissions
@@ -289 +303 @@
                         && $author->is_superuser );
                     return 1
-                      if ( ( $set eq 'blog' )
+                      if ( ( $_[0]->blog_id )
                         && $_[0]->has('administer_blog') );
                 }
             }
+            # return negative if a restriction is present
             return undef
               if $_[0]->restrictions && $_[0]->restrictions =~ /'$perm'/i;
-            ( defined($cur_perm) && $cur_perm =~ /'$perm'/i ) ? 1 : undef;
+            # return positive if permission is set in this permission set
+            return 1 if defined($cur_perm) && $cur_perm =~ /'$perm'/i;
+            # test for global-level permission
+            return 1
+              if $_[0]->author_id
+              && $_[0]->blog_id
+              && $_[0]->global_perms
+              && $_[0]->global_perms->has($perm);
+            return undef;
         };
     }

branches/fireball/lib/MT/Upgrade.pm

@@ -976 +976 @@
                     $file_template =~ s/%-C/<MTCategoryLabel dirify="-">/g;
                     $map->file_template($file_template);
-                },
-            },
-        },
-        'core_assign_all_permisssions_blog_admin' => {
-            version_limit => 4.0063,
-            priority => 3.4,
-            updater => {
-                type => 'permission',
-                label => 'Assigning all permissions to blog administrator...',
-                condition => sub {
-                    $_[0]->can_administer_blog && $_[0]->blog_id;
-                },
-                code => sub {
-                    my ($perm) = shift;
-                    $perm->set_full_permissions;
-                },
-            },
-        },
-        'core_recover_sysadmin_permissions' => {
-            version_limit => 4.0066,
-            priority => 3.5,
-            updater => {
-                type => 'permission',
-                label => 'Recover permissions of system administrators...',
-                condition => sub {
-                    !$_[0]->blog_id && !$_[0]->has('administer') && $_[0]->can_administer_blog;
-                },
-                code => sub {
-                    my ($perm) = shift;
-                    $perm->set_permissions('system');
                 },
             },