| Index: trunk/extensions/MoodBar/SpecialFeedbackDashboard.php |
| — | — | @@ -51,9 +51,9 @@ |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | // UI should allow users to select one or none |
| 55 | | - if ( $wgRequest->getVal( 'myresponse' ) == '1' ) { |
| | 55 | + if ( $wgRequest->getCheck( 'myresponse' ) ) { |
| 56 | 56 | $filters['responsefilter'] = 'myresponse'; |
| 57 | | - } elseif ( $wgRequest->getVal( 'showunanswered' ) == '1' ) { |
| | 57 | + } elseif ( $wgRequest->getCheck( 'showunanswered' ) ) { |
| 58 | 58 | $filters['responsefilter'] = 'showunanswered'; |
| 59 | 59 | } |
| 60 | 60 | } |
| — | — | @@ -334,7 +334,7 @@ |
| 335 | 335 | } |
| 336 | 336 | } |
| 337 | 337 | //only show response elements if feedback is not hidden, and user is logged in |
| 338 | | - else if ( $showResponseBox && $feedbackItem->getProperty('hidden-state') == false |
| | 338 | + elseif ( $showResponseBox && $feedbackItem->getProperty('hidden-state') == false |
| 339 | 339 | && !$wgUser->isAnon() ) { |
| 340 | 340 | //$respondToThis = "<span>".wfMessage('moodbar-respond-collapsed')->escaped().'</span> '.wfMessage("moodbar-respond-text")->escaped(); |
| 341 | 341 | $respondToThis = '<span class="fbd-item-response-collapsed"></span> '.wfMessage("moodbar-respond-text")->escaped(); |
| — | — | @@ -675,6 +675,14 @@ |
| 676 | 676 | 'username' => $wgRequest->getVal( 'username' ), |
| 677 | 677 | 'offset' => $offset, |
| 678 | 678 | ); |
| | 679 | + |
| | 680 | + if ( $wgRequest->getCheck( 'myresponse' ) ) { |
| | 681 | + $query['myresponse'] = $wgRequest->getVal( 'myresponse' ); |
| | 682 | + } |
| | 683 | + elseif ( $wgRequest->getCheck( 'showunanswered' ) ) { |
| | 684 | + $query['showunanswered'] = $wgRequest->getVal( 'showunanswered' ) ; |
| | 685 | + } |
| | 686 | + |
| 679 | 687 | if ( $backwards ) { |
| 680 | 688 | $query['dir'] = 'prev'; |
| 681 | 689 | } |
| Index: trunk/extensions/MoodBar/ApiQueryMoodBarComments.php |
| — | — | @@ -39,14 +39,14 @@ |
| 40 | 40 | $this->addOption( 'LIMIT', $params['limit'] + 1 ); |
| 41 | 41 | |
| 42 | 42 | |
| 43 | | - if ( $params['myresponse'] == '1' ) { |
| | 43 | + if ( isset( $params['myresponse'] ) ) { |
| 44 | 44 | if ( !$wgUser->isAnon() ) { |
| 45 | 45 | $this->addTables( array( 'moodbar_feedback_response' ) ); |
| 46 | 46 | $this->addJoinConds( array( 'moodbar_feedback_response' => array( 'INNER JOIN', 'mbf_id=mbfr_mbf_id' ) ) ); |
| 47 | 47 | $this->addWhereFld( 'mbfr_user_id', $wgUser->getId() ); |
| 48 | 48 | $this->addOption( 'GROUP BY', 'mbf_id' ); |
| 49 | 49 | } |
| 50 | | - } elseif ( $params['showunanswered'] == '1' ) { |
| | 50 | + } elseif ( isset( $params['showunanswered'] ) ) { |
| 51 | 51 | $this->addTables( array( 'moodbar_feedback_response' ) ); |
| 52 | 52 | $this->addJoinConds( array( 'moodbar_feedback_response' => array( 'LEFT JOIN', 'mbf_id=mbfr_mbf_id' ) ) ); |
| 53 | 53 | $this->addWhere( array( 'mbfr_id' => null ) ); |
| — | — | @@ -170,12 +170,8 @@ |
| 171 | 171 | 'user' => array( |
| 172 | 172 | ApiBase::PARAM_TYPE => 'user', |
| 173 | 173 | ), |
| 174 | | - 'myresponse' => array( |
| 175 | | - ApiBase::PARAM_TYPE => array( '1', '0' ), |
| 176 | | - ), |
| 177 | | - 'showunanswered' => array( |
| 178 | | - ApiBase::PARAM_TYPE => array( '1', '0' ), |
| 179 | | - ), |
| | 174 | + 'myresponse' => null, |
| | 175 | + 'showunanswered' => null, |
| 180 | 176 | 'prop' => array( |
| 181 | 177 | ApiBase::PARAM_TYPE => array( 'metadata', 'formatted', 'hidden' ), |
| 182 | 178 | ApiBase::PARAM_DFLT => 'metadata', |
| Index: trunk/extensions/MoodBar/modules/ext.moodBar.dashboard/ext.moodBar.dashboard.js |
| — | — | @@ -5,7 +5,7 @@ |
| 6 | 6 | /** |
| 7 | 7 | * Saved form state |
| 8 | 8 | */ |
| 9 | | - var formState = { types: [], username: '', myresponse: '0', showunanswered: '0' }; |
| | 9 | + var formState = { types: [], username: '', myresponse: null, showunanswered: null }; |
| 10 | 10 | |
| 11 | 11 | /** |
| 12 | 12 | * Save the current form state to formState |
| — | — | @@ -13,8 +13,8 @@ |
| 14 | 14 | function saveFormState() { |
| 15 | 15 | formState.types = getSelectedTypes(); |
| 16 | 16 | formState.username = $( '#fbd-filters-username' ).val(); |
| 17 | | - formState.myresponse = $( '#fbd-filters-my-response' ).prop( 'checked' ) ? $( '#fbd-filters-my-response' ).val() : '0'; |
| 18 | | - formState.showunanswered = $( '#fbd-filters-show-unanswered' ).prop( 'checked' ) ? $( '#fbd-filters-show-unanswered' ).val() : '0'; |
| | 17 | + formState.myresponse = $( '#fbd-filters-my-response' ).prop( 'checked' ) ? $( '#fbd-filters-my-response' ).val() : null; |
| | 18 | + formState.showunanswered = $( '#fbd-filters-show-unanswered' ).prop( 'checked' ) ? $( '#fbd-filters-show-unanswered' ).val() : null; |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | /** |
| — | — | @@ -133,10 +133,10 @@ |
| 134 | 134 | if ( formState.username.length ) { |
| 135 | 135 | reqData.mbcuser = formState.username; |
| 136 | 136 | } |
| 137 | | - if ( formState.myresponse != '0' ) { |
| | 137 | + if ( formState.myresponse ) { |
| 138 | 138 | reqData.mbcmyresponse = formState.myresponse; |
| 139 | 139 | } |
| 140 | | - if ( formState.showunanswered != '0' ) { |
| | 140 | + if ( formState.showunanswered ) { |
| 141 | 141 | reqData.mbcshowunanswered = formState.showunanswered; |
| 142 | 142 | } |
| 143 | 143 | |