Changeset 1128

Timestamp:

09/23/08 16:15:26 (14 months ago)

Author:

mpaschal

Message:

Add 'Collect Now' button to profile listing
Split first_update flag into synchronous scan and 'hide events without timestamps' flags
BugzID: 80151

Location:

trunk/ActionStreams/plugins/ActionStreams

Files:

• config.yaml (modified) (1 diff)
• lib/ActionStreams/Event.pm (modified) (3 diffs)
• lib/ActionStreams/Plugin.pm (modified) (5 diffs)
• tmpl/other_profiles.tmpl (modified) (2 diffs)

trunk/ActionStreams/plugins/ActionStreams/config.yaml

@@ -23 +23 @@
             add_other_profile:       $ActionStreams::ActionStreams::Plugin::add_other_profile
             remove_other_profile:    $ActionStreams::ActionStreams::Plugin::remove_other_profile
+            itemset_update_profiles: $ActionStreams::ActionStreams::Plugin::itemset_update_profiles
             itemset_hide_events:     $ActionStreams::ActionStreams::Plugin::itemset_hide_events
             itemset_show_events:     $ActionStreams::ActionStreams::Plugin::itemset_show_events

trunk/ActionStreams/plugins/ActionStreams/lib/ActionStreams/Event.pm

@@ -9 +9 @@
 use ActionStreams::Scraper;
 
-our $first_update = 0;
+our $hide_timeless = 0;
 
 __PACKAGE__->install_properties({
@@ -54 +54 @@
     my %profile = @_;
 
+    # Keep this option out of band so we don't have to count on
+    # implementations of update_events() passing it through.
+    local $hide_timeless = delete $profile{hide_timeless} ? 1 : 0;
+
     my $warn = $SIG{__WARN__} || sub { print STDERR $_[0] };
     local $SIG{__WARN__} = sub {
@@ -356 +360 @@
         });
         $event->tags(@$tags) if $tags;
-        if ($first_update && !$event->created_on) {
+        if ($hide_timeless && !$event->created_on) {
             $event->visible(0);
         }

trunk/ActionStreams/plugins/ActionStreams/lib/ActionStreams/Plugin.pm

@@ -366 +366 @@
         added          => $app->param('added')   ? 1 : 0,
         removed        => $app->param('removed') ? 1 : 0,
+        updated        => $app->param('updated') ? 1 : 0,
         _build_service_data(
             networks => $app->registry('profile_services'),
@@ -482 +483 @@
 }
 
+sub itemset_update_profiles {
+    my $app = shift;
+
+    my %users;
+    my $page_author_id;
+    PROFILE: for my $profile ($app->param('id')) {
+        my ($author_id, $type, $ident) = split /:/, $profile, 3;
+
+        my $user = ($users{$author_id} ||= MT->model('author')->load($author_id))
+            or next PROFILE;
+        next PROFILE
+            if $app->user->id != $author_id && !$app->user->is_superuser();
+
+        my $profiles = $user->other_profiles($type);
+        if (!$profiles) {
+            next PROFILE;
+        }
+        my @profiles = grep { $_->{ident} eq $ident } @$profiles;
+        for my $author_profile (@profiles) {
+            update_events_for_profile($user, $author_profile,
+                synchronous => 1);
+        }
+
+        $page_author_id = 1;
+    }
+
+    return $app->redirect($app->uri(
+        mode => 'other_profiles',
+        args => { id => ($page_author_id || $app->user->id), updated => 1 },
+    ));
+}
+
 sub first_profile_update {
     my ($cb, $app, $user, $profile) = @_;
-    require ActionStreams::Event;
-    local $ActionStreams::Event::first_update = 1;
-    update_events_for_profile($user, $profile);
+    update_events_for_profile($user, $profile,
+        synchronous => 1, hide_timeless => 1);
 }
 
@@ -979 +1011 @@
 
 sub update_events {
-    require ActionStreams::Event;
     my $mt = MT->app;
-
     $mt->run_callbacks('pre_action_streams_task', $mt);
 
@@ -1000 +1030 @@
 
 sub update_events_for_profile {
-    my ($author, $profile) = @_;
+    my ($author, $profile, %param) = @_;
     my $type = $profile->{type};
     my $streams = $profile->{streams};
     return if !$streams || !%$streams;
 
+    require ActionStreams::Event;
     my @event_classes = ActionStreams::Event->classes_for_type($type)
       or return;
@@ -1014 +1045 @@
         next EVENTCLASS if !$streams->{$event_class->class_type};
 
-        if ($ActionStreams::Event::first_update) {
-            # Do the first update synchronously.
+        if ($param{synchronous}) {
             $event_class->update_events_safely(
-                author => $author,
+                author        => $author,
+                hide_timeless => $param{hide_timeless} ? 1 : 0,
                 %$profile,
             );

trunk/ActionStreams/plugins/ActionStreams/tmpl/other_profiles.tmpl

@@ -56 +56 @@
         </mtapp:statusmsg>
     </mt:if>
+    <mt:if name="updated">
+        <mtapp:statusmsg
+            id="updated"
+            class="success">
+            <__trans phrase="The selected profiles were scanned for updates.">
+        </mtapp:statusmsg>
+    </mt:if>
 </mt:setvarblock>
 
@@ -76 +83 @@
         title="<__trans phrase="Delete selected profiles (x)">"
         ><__trans phrase="Delete"></a>
+    <a href="javascript:void(0)"
+        onclick="doForMarkedInThisWindow(getByID('profile-listing-form'), '<__trans phrase="profile">', '<__trans phrase="profiles">', 'id', 'itemset_update_profiles'); return false"
+        title="<__trans phrase="Scan now for new actions">"
+        ><__trans phrase="Update Now"></a>
 </mt:setvarblock>
 <mt:var name="position_actions_top" value="1">