Changeset 814

Timestamp:

12/01/06 13:46:30 (2 years ago)

Author:

fumiakiy

Message:

Implemented choice of weblogs in backup operation. BugId: 28878

Files:

• branches/wheeljack/lib/MT/App/CMS.pm (modified) (5 diffs)
• branches/wheeljack/lib/MT/BackupRestore.pm (modified) (4 diffs)
• branches/wheeljack/lib/MT/Object.pm (modified) (4 diffs)
• branches/wheeljack/tmpl/cms/backup_restore.tmpl (modified) (2 diffs)

branches/wheeljack/lib/MT/App/CMS.pm

@@ -144 +144 @@
-        'list_roles' => \&list_roles,
-        'dialog_select_weblog' => \&dialog_select_weblog,
-        'dialog_select_user' => \&dialog_select_user,
-        'dialog_grant_role' => \&dialog_grant_role,
-        'grant_role' => \&grant_role,
@@ -10816 +10815 @@
-    return $app->errtrans("What to backup must be selected.") if !$what;
-
-    my $meth = "backup_$what";
-    $app->$meth(@_);
-}
-
-sub backup_everything {
-    my $app = shift;
-    my $user = $app->user;
-    
-    my $q = $app->param;
-    my $number = $q->param('num_items') || 0;
-    return $app->errtrans('[_1] is not a number.', $number)
-        if $number !~ /^\d+$/;
+
+    my $blog_ids = $q->param('selected_blog_ids') if $what eq 'custom';
+    return $app->errtrans('Choose weblogs to backup.') if $what eq 'custom' && (!defined($blog_ids) || !$blog_ids);
+
+    my @blog_ids = split ',', $blog_ids;
+
-    my $archive = $q->param('backup_archive_format');
-    my $enc = $app->config('PublishCharset') || 'utf-8';
@@ -11005 +11001 @@
-        };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-
@@ -11490 +11469 @@
-}
-
+sub dialog_select_weblog {
+    my $app = shift;
+    return $app->errtrans("Permission denied.")
+        unless $app->user->is_superuser;
+
+    my $hasher = sub {
+        my ($obj, $row) = @_;
+        $row->{label} = $row->{name};
+        $row->{'link'} = $row->{site_url};
+    };
+
+    $app->listing({
+        Type => 'blog',
+        Code => $hasher,
+        Template => 'dialog_select_weblog.tmpl',
+        Params => {
+            dialog_title => $app->translate("Select Weblog"),
+            items_prompt => $app->translate("Selected Weblog"),
+            search_prompt => $app->translate("Type a weblog name to filter the choices below."),
+            panel_label => $app->translate("Weblog Name"),
+            panel_description => $app->translate("Description"),
+            panel_type => 'blog',
+            panel_multi => 1,
+            panel_searchable => 1,
+            panel_first => 1,
+            panel_last => 1,
+            list_noncron => 1,
+        },
+    });
+}
+
-1;
-__END__
@@ -12366 +12376 @@
-Handler for the system backup function.
-
-backup_
-
-restore
+
+
+backup
-
-=back

branches/wheeljack/lib/MT/BackupRestore.pm

@@ -17 +17 @@
-use File::Copy;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    my $header .= "<movabletype xmlns='" . NS_MOVABLETYPE . "'>\n";
@@ -35 +75 @@
-
-    my $files = {};
-
+
+
-
-    $printer->('</movabletype>');
@@ -45 +86 @@
-
-    my $counter = 0;
-
-
+
+
+
+
+
+
+
+
-        my $err = $@;
-        if ($err) {
@@ -53 +100 @@
-        }
-        my $offset = 0;
+        my $term = $term_arg->{term} || {};
+        my $args = $term_arg->{args};
-        while (1) {
-
+
+
+
-            last unless @objects;
-            $offset += scalar @objects;
-            for my $object (@objects) {
+                next if ($class eq 'MT::Author') && exists($author_ids_seen{$object->id});
-                $counter++;
-                if ($number && ($counter % $number == 0)) {
-                    $splitter->(int($counter / $number + 1));
-                }
-
-
+
+
+
+
+
-                    $files->{$object->id} = [$object->url, $object->file_path, $object->file_name];
-                } else {
-                    $printer->($object->to_xml . "\n") if $object->to_backup;
-                }
-                my $xml = $callback->($object)

branches/wheeljack/lib/MT/Object.pm

@@ -386 +386 @@
-sub children_to_xml {
-    my $obj = shift;
+    my ($args) = @_;
+
+    my $t = {};
+    if (defined($args)) {
+        my $j = $args->{'join'};
+        $t = $j->[2] if defined($j);
+    }
-
-    my $children = $obj->children_names;
@@ -396 +403 @@
-        return $err if defined($err) && $err;
-
+        my $terms = { 
+            $obj->datasource . '_id' => $obj->id,
+            %$t,
+        };
+        
-        my $offset = 0;
-        while (1) {
-            my @objects = $child_class->load(
-{ $obj->datasource . '_id' => $obj->id, }
+$terms
-                { offset => $offset, limit => 50, }
-            );
@@ -414 +426 @@
-sub to_xml {
-    my $obj = shift;
+    my ($args) = @_;
-
-    my $coldefs = $obj->column_defs;
@@ -438 +451 @@
-    $xml .= '>';
-    $xml .= "<$_>" . MT::Util::encode_xml($obj->column($_), 1) . "</$_>" foreach @elements;
-
+($args)
-    $xml .= '</' . $obj->datasource . '>';
-    $xml;

branches/wheeljack/tmpl/cms/backup_restore.tmpl

@@ -4 +4 @@
-
-function highlightSwitch(selection) {
-    var customizePanel = getByID('customize-panel');
-    var descriptionObject = getByID('backup-what-description');
-customizePanel
+descriptionObject
-        if (selection.value == 'custom') {
-customizePanel.style.display = ''
+openDialog(this.form, 'dialog_select_weblog')
-            descriptionObject.innerHTML = '<MT_TRANS phrase="This option allows you to choose exactly what you want to backup.">';
-        } else if (selection.value == 'allentries') {
-            customizePanel.style.display = 'none';
-            descriptionObject.innerHTML = '<MT_TRANS phrase="This option will backup Entries, Categories, and Templates as well as related objects such as Comments and Authors.">';
-        } else {
-
+
+
+
+
-            descriptionObject.innerHTML = '<MT_TRANS phrase="This option will backup Users, Roles, Associations, Weblogs, Entries, Categories, Templates and Tags.">';
-        }
@@ -47 +46 @@
-<select name="backup_what" id="backup_what" onchange="highlightSwitch(this)">
-<option value="everything" selected="selected"><MT_TRANS phrase="Everything"></option>
-
-
+
-</select>
-
-
-
-
-
-
-
-
-
-
-
+
+
-<p><span id="backup-what-description"><MT_TRANS phrase="This option will backup Users, Roles, Associations, Weblogs, Entries, Categories, Templates and Tags."></span>
-<a href="#" onclick="return openManual('backup_restore', 'backup_what')" class="help">?</a></p>