r111474 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r111473‎ | r111474 | r111475 >
Date:19:57, 14 February 2012
Author:emsmith
Status:resolved (Comments)
Tags:
Comment:
bug 34090 - remove a todo - take the note from the flag submission and save it properly, use the feedback length configuration item to chop it if a length is set, 0 means no check
Modified paths:
  • /trunk/extensions/ArticleFeedbackv5/api/ApiFlagFeedbackArticleFeedbackv5.php (modified) (history)

Diff [purge]

Index: trunk/extensions/ArticleFeedbackv5/api/ApiFlagFeedbackArticleFeedbackv5.php
@@ -26,6 +26,7 @@
2727 $pageId = $params['pageid'];
2828 $feedbackId = $params['feedbackid'];
2929 $flag = $params['flagtype'];
 30+ $notes = $params['note'];
3031 $direction = isset( $params['direction'] ) ? $params['direction'] : 'increase';
3132 $counts = array( 'increment' => array(), 'decrement' => array() );
3233 $counters = array( 'abuse', 'helpful', 'unhelpful' );
@@ -165,9 +166,16 @@
166167 // Log the feedback activity entry via the utils method
167168 $activity = $this->getActivity( $flag, $direction );
168169
169 - // TODO: when activities have notes attached, they need to be fed as the last parameter
170 - ApiArticleFeedbackv5Utils::logActivity( $activity , $pageId, $feedbackId, 'placeholder activity notes' );
 170+ // Make sure our notes are not too long - we won't error, just hard substr it
 171+ global $wgArticleFeedbackv5MaxCommentLength;
171172
 173+ // for some reason, 0 means no length checking (ARGH) - should be -1!
 174+ if ($wgArticleFeedbackv5MaxCommentLength > 0) {
 175+ $notes = substr($notes, 0, $wgArticleFeedbackv5MaxCommentLength);
 176+ }
 177+
 178+ ApiArticleFeedbackv5Utils::logActivity( $activity , $pageId, $feedbackId, $notes );
 179+
172180 // Update the filter count rollups.
173181 ApiArticleFeedbackv5Utils::incrementFilterCounts( $pageId, $counts['increment'] );
174182 ApiArticleFeedbackv5Utils::decrementFilterCounts( $pageId, $counts['decrement'] );
@@ -294,6 +302,11 @@
295303 ApiBase::PARAM_ISMULTI => false,
296304 ApiBase::PARAM_TYPE => array(
297305 'increase', 'decrease' )
 306+ ),
 307+ 'note' => array(
 308+ ApiBase::PARAM_REQUIRED => false,
 309+ ApiBase::PARAM_ISMULTI => false,
 310+ ApiBase::PARAM_TYPE => 'string'
298311 )
299312 );
300313 }
@@ -306,7 +319,8 @@
307320 public function getParamDescription() {
308321 return array(
309322 'feedbackid' => 'FeedbackID to flag',
310 - 'type' => 'Type of flag to apply - hide or abuse'
 323+ 'type' => 'Type of flag to apply - hide or abuse',
 324+ 'note' => 'Information on why the feedback activity occurred'
311325 );
312326 }
313327

Follow-up revisions

RevisionCommit summaryAuthorDate
r111552bug 34090 - split activity notes into their own config for maximum length (th...emsmith16:07, 15 February 2012
r111557bug 34090 - changed structure of the link classes and ids per the following f...emsmith16:47, 15 February 2012
r111570bug 34090 - request oversight is now a counter - so you can request/unrequest...emsmith19:53, 15 February 2012
r111573bug 34090 - removed the "header" portion of the html generation from the acti...emsmith20:18, 15 February 2012
r111645bug 34090 - updated the filter count update script to get requested oversight...emsmith15:45, 16 February 2012
r112038bug 34090 - added additional counts for filters including unhidden, undeleted...emsmith20:28, 21 February 2012
r112039bug 34090 - fixed issue noted : if $feedback is false return nothing - not th...emsmith20:50, 21 February 2012
r112041bug 34090 - kill the -1 issue by never letting it get below 0emsmith21:08, 21 February 2012
r112115bug 34090 - no code changes, just fixing/adding keyword svn propertiesemsmith16:31, 22 February 2012
r112119bug 34090 - cast the naughty column so it can be signed, the greatest still k...emsmith16:57, 22 February 2012
r112142bug 34090 - toggle for atomic un/helpful changing (and elimination of an extr...emsmith20:37, 22 February 2012
r112147bug 34090 - note to self, watch the copy and paste errors...emsmith21:01, 22 February 2012
r112149bug 34090 - no upper limit, only lower limit - we can't get any worse then 0emsmith21:21, 22 February 2012
r112154bug 34090 - quick and dirty helper script to get missing documentation keysemsmith21:57, 22 February 2012
r112156bug 34090 - only send the activity header if continue < 1, make the more div ...emsmith22:14, 22 February 2012
r112161bug 34090 - fix limit and use old continue to determine if we do the headeremsmith23:15, 22 February 2012
r112218bug 34090 - make sure the name are right for hidden/unhidden logging (argh)emsmith16:44, 23 February 2012
r112225bug 34090 - unhidden and unoversight logic adjustmentsemsmith18:06, 23 February 2012
r112228bug 34090 - fix filter - needsoversight are always autohiddenemsmith19:16, 23 February 2012
r112230bug 34090 - let's try this again - needsoversight and declined will have hidd...emsmith19:38, 23 February 2012
r112232bug 34090 - hide and show shouldn't fiddle with oversight counts or declined ...emsmith19:48, 23 February 2012
r112599bug 34090 - follow up to r111211 - rename things to make them "less confusin...emsmith14:43, 28 February 2012
r112603bug 34090 - Add the logging of automated hide/show errors by the "Article Fee...emsmith15:21, 28 February 2012
r112604bug 34090 - can't believe there were no permissions checks in this - only del...emsmith15:38, 28 February 2012
r112610bug 34090 - change all sql updates to use escaping except for explicitly comm...emsmith16:22, 28 February 2012
r112611bug 34090 - take out implicit show and add returning user that hid/oversighte...emsmith17:02, 28 February 2012
r112627bug 34090 - follow up to r112599 - change to use getText since it's going int...emsmith18:53, 28 February 2012
r112825bug 34090 - insert custom attributes (sigh) for the user and formatted timest...emsmith18:14, 1 March 2012
r112830bug 34090 - follow up to r111474 - use truncate for choppingemsmith19:42, 1 March 2012
r113052bug 34090 - remaining backend feature in requirements, oversight email genera...emsmith18:04, 5 March 2012
r113062bug 34090 - follow up to r110520 1. change index 2. default of null for conti...emsmith18:54, 5 March 2012
r113073bug 34090 - follow up to r111472 part 1 - change to use getDbKey, check for b...emsmith19:48, 5 March 2012
r113082bug 34090 - follow up to r111471 - changed to use text()emsmith20:42, 5 March 2012
r113083bug 34090 - follow up to rr111472 part 2 - only use log_id for orderingemsmith20:48, 5 March 2012
r113104bug 34090 - follow up to rr111472 part 3 - totally redo the continue function...emsmith23:10, 5 March 2012
r113159bug 34090 - follow up to rr111472 part 4 and follow up to r111596 (same issue...emsmith17:37, 6 March 2012
r113160bug 34090 - follow up to rr111472 part 5 plural and number format action countemsmith17:48, 6 March 2012
r113161bug 34090 - follow up to rr111472 part 6 last of lego messagesemsmith17:53, 6 March 2012
r113163bug 34090 - two additional configuration settings (help url and admin user ur...emsmith18:02, 6 March 2012
r113193bug 34090 - followup to r113104 - only sort by timestamp (sorting by log id w...emsmith22:56, 6 March 2012
r113228bug 34090 - followup to r113160emsmith14:05, 7 March 2012
r113247bug 34090 - db issue, remove one of the sorts from the query, use the ids arr...emsmith16:52, 7 March 2012
r113269bug 34090 - followup to r113247emsmith19:01, 7 March 2012
r113273bug 34090 - add javascript level hiding on request oversight IF autohidden is...emsmith19:22, 7 March 2012
r113287bug 34090 - usernames and formatted timestamps into red lines for hidden/over...emsmith20:22, 7 March 2012
r113311bug 34090 - fixing the username bugs - apparently using the data- stuff with ...emsmith22:34, 7 March 2012
r113317bug 34090 - js and css voodoo to make the element with the red lines appear a...emsmith23:01, 7 March 2012
r113370bug 34090 - make different titles for masking appear if it's been hidden or o...emsmith16:43, 8 March 2012
r113371bug 34090 - fixes for oversighter view for hide/oversight panelsemsmith17:51, 8 March 2012
r113383bug 34090 - not entirely necessary, but keeps $2 from showing up in hiders pa...emsmith19:25, 8 March 2012
r113384bug 34090 - fix for double red line issues when hiding an oversighted post ha...emsmith19:28, 8 March 2012
r113390bug 34090 - adding translation for "automatic hider" useremsmith19:44, 8 March 2012
r113392bug 34090 - followup to r113287 - adjusted localization documentationemsmith20:03, 8 March 2012
r113393bug 34090 - followup to r113370 - adjusted localization documentationemsmith20:05, 8 March 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r111211bug 34090 - Added a log namespace and log types for the Article Feedback v5 e...emsmith22:53, 10 February 2012
r111472bug 34090 - Added an additional column in the main feedback table to keep a c...emsmith19:14, 14 February 2012

Comments

#Comment by Catrope (talk | contribs)   19:10, 1 March 2012
+ $notes = substr($notes, 0, $wgArticleFeedbackv5MaxCommentLength);

Don't use substr to truncate text, use $wgLang->truncate(). That will truncate things in a safe and sane way for non-ASCII languages.

OK otherwise.

Status & tagging log