Merge branch 'master' of ssh://trac.corp.sourceforge.com/srv/git/slash

scc · Nov 20, 2008 · ff6a92c · ff6a92c
2 parents 5aeef1e + 7ee344a
commit ff6a92c
Show file tree

Hide file tree

Showing 8 changed files with 232 additions and 212 deletions.
diff --git a/Slash/Apache/User/User.pm b/Slash/Apache/User/User.pm
diff --git a/plugins/FireHose/FireHose.pm b/plugins/FireHose/FireHose.pm
@@ -637,7 +637,7 @@ sub getFireHoseEssentials {
 		$tables .= ', tags';
 		push @where, 'tags.globjid=firehose.globjid';
 	}
-	if($options->{tagged_as}) {
+	if ($options->{tagged_as}) {
 		my $tag_id = $tags->getTagnameidFromNameIfExists($options->{tagged_as}) || 0;
 		push @where, "tags.tagnameid = $tag_id";
 	}

diff --git a/plugins/FireHose/templates/dispFireHose;firehose;default b/plugins/FireHose/templates/dispFireHose;firehose;default
@@ -152,7 +152,7 @@ END %]
 								</span>
 								[% END %]
 									[% IF item.type == "journal" %]
-										[% IF (options.view == "userjournal" || view_mode) && item.bodytext %]
+										[% IF (options.view.match('^userjournal') || view_mode) && item.bodytext %]
 											<div class="bodytext">[% item.bodytext %]</div>
 										[% ELSE %]
 											<div id="text-[% item.id %]">

diff --git a/plugins/FireHose/templates/paginate;firehose;default b/plugins/FireHose/templates/paginate;firehose;default
@@ -20,7 +20,7 @@ __template__
 [% IF fh_page == "users.pl"; day_page = "firehose.pl"; END %]
 [% IF form.index; day_page = "index2.pl"; END %]
 [% submit_plug = "";
-   IF options.view == "userjournal";
+   IF options.view.match('^userjournal');
 	submit_plug = '<span style="margin-left: 1em"><a href="' _ gSkin.rootdir _ '/journal.pl?op=edit" class="vbutton bg_666666 rd_5">Write in Journal</a></span>';
    ELSIF options.view == "usersubmission";
 	submit_plug = '<span style="margin-left: 1em"><a href="' _ gSkin.rootdir _ '/submit.pl?primaryskid=' _ gSkin.skid _ '" class="vbutton bg_666666 rd_5">Submit Story</a></span>';

diff --git a/sql/mysql/upgrades b/sql/mysql/upgrades
@@ -5656,8 +5656,6 @@ INSERT INTO firehose_view (id, uid, viewname, useparentfilter, filter, orderby,
 INSERT INTO firehose_view (id, uid, viewname, useparentfilter, filter, orderby, orderdir, color, duration, mode, mixedmode, tab_display, options_edit, admin_maxitems, maxitems, seclev, pause) VALUES (NULL, 0, "popular", "yes", '-story', "createtime", "DESC", "black", "7", "full", "1", "yes", "yes", 50, 30, 0,"");
 INSERT INTO firehose_view (id, uid, viewname, useparentfilter, filter, orderby, orderdir, color, duration, mode, mixedmode, tab_display, options_edit, admin_maxitems, maxitems, seclev, pause) VALUES (NULL, 0, "daddypants", "yes", 'unsigned', "createtime", "DESC", "indigo", "-1", "fulltitle", "1", "yes", "yes", 50, 30, 100,"");
 
-# PUDGE LAST UPDATED HERE
-
 UPDATE firehose_view SET filter="-story" WHERE viewname="popular";
 
 # 2008-11-06
@@ -5685,3 +5683,5 @@ INSERT INTO firehose_view (id, uid, viewname, useparentfilter, filter, orderby,
 UPDATE firehose_view SET mixedmode="" WHERE viewname="daddypants";
 ALTER TABLE firehose_view MODIFY COLUMN viewname VARCHAR(24) DEFAULT 'unnamed';
 INSERT INTO firehose_view (id, uid, viewname, useparentfilter, filter, orderby, orderdir, color, duration, mode, mixedmode, tab_display, options_edit, admin_maxitems, maxitems, seclev, pause) VALUES (NULL, 0, "userjournalfriends", "no", '"authorfriend:{nickname}" journal', "createtime", "DESC", "black", "-1", "full", "0", "no", "no", 20, 20, 0,"1");
+
+# PUDGE LAST UPDATED HERE
diff --git a/themes/slashcode/htdocs/users2.pl b/themes/slashcode/htdocs/users2.pl
@@ -1421,7 +1421,7 @@ sub showInfo {
 		}
 
 		if ( (!$form->{dp} && !$user->{is_admin})  ||
-		     ($form->{dp} eq 'firehose' || $form->{dp} eq 'journal' || $form->{dp} eq 'submissions' || $form->{dp} eq 'bookmarks' || $form->{dp} eq 'usertag')) {
+		     ($form->{dp} eq 'firehose' || $form->{dp} =~ /^journal/ || $form->{dp} eq 'submissions' || $form->{dp} eq 'bookmarks' || $form->{dp} eq 'usertag')) {
 
 			$form->{listonly} = 1;
 			$form->{mode} = "full";

diff --git a/themes/slashcode/templates/u2MainView;users;default b/themes/slashcode/templates/u2MainView;users;default
@@ -151,6 +151,11 @@ __template__
 		fhbox = fh.listView({ fh_page => 'users.pl', view => 'userjournal', user_view => useredit, not_id => not_fhid });
                 fhbox;
 
+           ELSIF data_pane == 'journalfriends';
+                fh = Slash.getObject("Slash::FireHose");
+                fhbox = fh.listView({ fh_page => 'users.pl', view => 'userjournalfriends', user_view => useredit, not_id => not_fhid });
+                fhbox;
+
            ELSIF data_pane == 'submissions';
                 fh = Slash.getObject("Slash::FireHose");
                 fhbox = fh.listView({ fh_page => 'users.pl', view => 'usersubmission', user_view => useredit, not_id => not_fhid });

diff --git a/themes/slashcode/templates/userInfo2;users;default b/themes/slashcode/templates/userInfo2;users;default
@@ -268,6 +268,11 @@ __template__
 					fhbox = fh.listView({ fh_page => 'users.pl', view => 'userjournal', user_view => useredit });
 					fhbox;
 
+		                   ELSIF data_pane == 'journalfriends';
+					fh = Slash.getObject("Slash::FireHose");
+					fhbox = fh.listView({ fh_page => 'users.pl', view => 'userjournalfriends', user_view => useredit });
+					fhbox;
+
 		                   ELSIF data_pane == 'submissions';
 					fh = Slash.getObject("Slash::FireHose");
 					fhbox = fh.listView({ fh_page => 'users.pl', view => 'usersubmission', user_view => useredit });