aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/request_controller.rb
Commit message (Collapse)AuthorAgeLines
* Allow custom states to be tested.Louise Crow2015-02-09-5/+3
| | | | | | Since https://github.com/mysociety/alaveteli/commit/80ad2d4c31075ffc994e8c48ea25e6e3c486c364 no themes have been loaded by tests unless explicitly specified, so I think it's safe to remove the code added in https://github.com/mysociety/alaveteli/commit/3dfc53f6b82b3c5da79a4c710d45b859f61f4f5f
* Merge branch '2051-back-to-search' into rails-3-developGareth Rees2015-01-13-0/+1
|\
| * Add a “Back to search results” linkGareth Rees2015-01-13-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the search parameters in the flash when a search is made via the select_authority_path page. Stores the parameters for both POST and AJAX typeahead searches. The presence of stored search params renders the link on the PublicBodyController#show template. “keep”s the search params in PublicBodyController#show so that if the user clicks the browser’s back button the “Back to search results” link can still be rendered on the next search result they click. “keep”s all flash keys in ServicesController#other_country_message as it’s called through AJAX and ends up sweeping the flash. [1] [1] More details about this: http://mikenaberezny.com/2007/09/08/keep-the-flash-and-test-it-too/
* | Use a partial to render batch sent messageGareth Rees2015-01-13-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropped the law_used_full interpolation: So I think there are two significant bits of context here. One is that the law_used_full attribute is derived from law_used, which in turn is set on InfoRequest initialisation based on the tags applied to the public body. So different requests in a batch could have different values for law_used_full - some of them might be to bodies that only accept environmental information requests. So using the value from the batch template is not really a good proxy for the whole collection. The second is that, in any case, the distinction between the two types of request is a UK-specific feature which should be moved to the UK theme (#2085). Given these two factors, I think the cleanest thing might be to drop law_used_full from this descriptive text, and just have it say "Your requests will be sent shortly", without specifying what law will be used. – Louise Crow (@crowbot)
* | Use a partial to render request sent messageGareth Rees2015-01-13-7/+1
|/
* Merge branch 'hotfix/0.20.0.2' into rails-3-developLouise Crow2015-01-07-0/+3
|\
| * Sanitize the contents of HTML attachments before displayLouise Crow2014-12-22-0/+4
| |
* | Merge branch 'brakeman_fixes' into rails-3-developLouise Crow2014-12-18-2/+9
|\ \
| * | Line lengthGareth Rees2014-12-18-1/+9
| | |
| * | Add global protect_from_forgeryGareth Rees2014-12-18-1/+0
| |/ | | | | | | | | | | | | Grepping the git logs didn’t bring up a good reason for this to be excluded. Seems like it came along after the app was initially created so it never got fully added for fear of regressions. The specs pass for this commit.
* | Refactor the application of masks and censor rules to messages.Louise Crow2014-12-15-6/+6
| | | | | | | | | | | | | | | | | | | | Seems more logical to make this one method that figures out what to do based on file type. Plus, incoming message does so many things, it seemed like having these related methods be separate would make them easier to read and understand. Also, email, mobile and login substitution texts weren't being translated. Finally, I think passing the censor rules and masks as arguments is a first step in some more decoupling of models.
* | RequestController#search_typaahead limit resultsGareth Rees2014-11-11-1/+3
| | | | | | | | Use the per_page parameter to limit the results returned
* | RequestController#search_typeahead filter by bodyGareth Rees2014-11-11-4/+10
|/ | | | | Action now supports the `request_from` param as per the Xapian filtering system to filter search typeaheads by public body
* Extract initial and followup sending from modelGareth Rees2014-10-17-3/+30
|
* Reword View Requests to Browse Requests in navGareth Rees2014-08-21-1/+1
| | | | | | | User testing highlighted that it was easy to mistake "View Requests" for a Facebook-style wall rather than the list of all requests. [1] [1] https://github.com/mysociety/alaveteli/issues/1505
* Rename XXX comments with TODO:Gareth Rees2014-06-10-4/+4
| | | | Picks these up in `rake notes` and adds semantic meaning
* Fix operator precedenceLouise Crow2014-06-02-1/+1
| | | | | Was switched to && for style but in fact for control flow, and is what we want.
* Redirect to the frontpage rather than error on invalid paramsLouise Crow2014-06-02-0/+6
| | | | Fixes #1448.
* Update gubbins to call AttachmentToHTMLGareth Rees2014-04-07-13/+8
|
* Use AttachmentToHTML to generate FoiAttachment#body_as_htmlGareth Rees2014-03-28-8/+12
|
* Correctly call helpers in RequestController#describe_stateGareth Rees2014-03-13-2/+2
| | | | | | Calling simple_date threw an exception as it uses a helper internally. Only LinkToHelper is included in to the controller, so the underlying helper was not available.
* Merge branch 'feature/batch-requests' into rails-3-developLouise Crow2014-01-29-88/+196
|\ | | | | | | | | | | Conflicts: config/general.yml-example spec/factories.rb
| * Preserve whitespace in strings for translation.Louise Crow2014-01-28-1/+1
| | | | | | | | | | Otherwise they get marked as fuzzy in .po files and lose their existing translations.
| * Update notices for offline sending.Louise Crow2013-12-04-14/+4
| |
| * Split the creation of a batch and the associated requests.Louise Crow2013-12-04-5/+6
| | | | | | | | We're going to want to actually create and send the requests later.
| * Add list of bodies batch request will be sent to.Louise Crow2013-12-04-0/+6
| |
| * Javascript enhancements.Louise Crow2013-12-04-6/+18
| | | | | | | | Add or remove all buttons, ajax search as you type.
| * Raise limit on results to 1000.Louise Crow2013-12-04-1/+1
| | | | | | | | | | Seems like you have to specify a limit with xapian. We'll probably want to document the limit somewhere on this page.
| * Move creation of batch to InfoRequestBatch.Louise Crow2013-12-04-21/+7
| |
| * Add a rudimentary view for an info request batch.Louise Crow2013-12-04-2/+0
| |
| * Notices for success and errors.Louise Crow2013-12-04-7/+28
| |
| * Add check for double submission.Louise Crow2013-12-04-5/+8
| |
| * Make method names for finding existing objects clearerLouise Crow2013-12-04-2/+2
| | | | | | | | | | They're not finding by the existing object, they're finding an existing object.
| * Simple code for the happy pathLouise Crow2013-12-04-19/+21
| | | | | | | | | | Create the batch and associate new requests with it, send the outgoing messages, and redirect to a page for the new batch.
| * Remove extra 'is invalid' error message.Louise Crow2013-12-04-2/+4
| | | | | | | | | | | | This duplicates what's done in the new action, but I can't currently think of a way of sharing functionality that doesn't seem overly complex and/or risky.
| * Handle a banned user making batch requests.Louise Crow2013-12-04-1/+5
| |
| * Batch users don't have a daily limit.Louise Crow2013-12-04-2/+1
| | | | | | | | | | | | | | It doesn't make logical sense that they would. However I am preserving the ability to make batch requests as a separate thing from not having a daily limit - I think batch sending requires a (perhaps marginally) bigger level of trust.
| * Pass public bodies list through forms.Louise Crow2013-12-04-1/+0
| |
| * Require at least one public body in the params.Louise Crow2013-12-04-3/+3
| |
| * Create template and outgoing messageLouise Crow2013-12-04-18/+60
| | | | | | | | | | Add validation, preview as in single request creation. Add comments noting further work to be done in this action.
| * Isolate code for preparing to display the compose interface.Louise Crow2013-12-04-51/+67
| | | | | | | | Reuse it for the batch request page.
| * Add new_batch actionLouise Crow2013-12-04-15/+23
| | | | | | | | | | | | Give it basic access control, and add some conditionals to the 'new' template around bits that use @info_request.public_body so that they render something different if @batch is assigned.
| * Add template for select_authoritiesLouise Crow2013-12-04-0/+11
| | | | | | | | Should retain a list of selected public bodies across searches.
| * Handle not enabled, no user, unauthorised user.Louise Crow2013-12-04-12/+17
| |
| * Add a select_authorities action.Louise Crow2013-12-04-0/+3
| |
* | Merge branch 'feature/cache-request-lists' into rails-3-developLouise Crow2014-01-28-7/+5
|\ \
| * | Cache frequently accessed request lists.Louise Crow2013-12-19-7/+5
| | | | | | | | | | | | Make specs a bit more focused, remove view specs - they're not relevant to the new code in their current form and don't seem to merit updating.
| * | Move make_query_from_params to XapianQueriesLouise Crow2013-12-19-1/+1
| |/ | | | | | | | | | | | | | | | | | | This is involved with the construction of meaningful xapian queries with respect to InfoRequestEvents. This commit also removes the get_tags_from_params method, which presumably was targeted at PublicBodies, but doesn't seem to actually be used anywhere. XapianQueries is used to extend InfoRequestEvent in order to prevent InfoRequestEvent becoming too unwieldy and to preserve the association between these methods.
* / localisation bug fixed in request_controllerGyörgy Peng2014-01-08-1/+1
|/ | | It is a better solution to forma sentenses in po file, therefore the substring in variable added to _() as a parameter.
* Merge remote-tracking branch 'origin/merged-rails-3-2-assset-pipeline' into ↵Louise Crow2013-11-29-2/+3
|\ | | | | | | | | | | | | rails-3-develop Conflicts: Gemfile.lock
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-20 10:51:55 +0000