aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/request_controller.rb
Commit message (Collapse)AuthorAgeLines
* Merge remote-tracking branch 'origin/merged-rails-3-2-assset-pipeline' into ↵Louise Crow2013-11-29-2/+3
|\ | | | | | | | | | | | | rails-3-develop Conflicts: Gemfile.lock
| * Don't specify format in template name.Louise Crow2013-11-12-2/+3
| | | | | | | | | | In render calls, that's now deprecated in favour of using the :formats option.
* | Cache the similar requests for 1 dayLouise Crow2013-11-25-0/+7
| |
* | Move getting similar requests to the InfoRequest model.Louise Crow2013-11-25-9/+0
|/
* Revert "No need to set permissions on file now."Louise Crow2013-09-19-0/+1
| | | | | | In fact, we do still need to set permissions. This reverts commit 56ce526acdcb1b5493bc11f14b751b5c3f02f686.
* Remove extra "is invalid" message.Louise Crow2013-09-18-1/+1
| | | | Fixes #1101.
* Merge branch 'feature/hide-individual-responses' into rails-3-developLouise Crow2013-09-17-67/+92
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile app/views/admin_request/edit_outgoing.html.erb config/packages doc/CHANGES.md doc/INSTALL.md spec/models/info_request_spec.rb spec/models/public_body_spec.rb
| * Use 403, not 410, for hidden items.Louise Crow2013-09-16-2/+2
| | | | | | | | | | As @mhl points out, this more clearly indicates that they may come back at some point.
| * No need to set permissions on file now.Louise Crow2013-09-16-1/+0
| | | | | | | | | | Either rails or the webserver will be sending it, we're not redirecting anymore.
| * Add message index to attachment filesLouise Crow2013-09-16-1/+3
| | | | | | | | | | So that files attached to different messages with the same name and url_part don't get overwritten.
| * Add public criteria for message event access methodsLouise Crow2013-09-16-1/+1
| | | | | | | | | | | | | | get_last_response_event and get_last_outgoing_event are used in various places to determine which events to link to, use in queries etc. Restrict them to refer to the last publicly visible event of the relevant type, and rename them to make that clear.
| * Shorter way of getting text template.Louise Crow2013-09-16-1/+1
| |
| * Move some download methods to InfoRequest.Louise Crow2013-09-16-10/+6
| | | | | | | | | | | | Use send_file to send zips. Also adds 'all_can_view_all_correspondence?' - is this request completely cachable, or do we need to cache different versions for different levels of privilege?
| * Restore the download for hidden requestsLouise Crow2013-09-16-4/+4
| | | | | | | | | | | | This was disabled for hidden requests as the download was by redirect, allowing people who have not been authenticated to conceivably access the download. We'll be moving to send_file instead, so can restore it.
| * Make sure that info_request gets assigned to the viewLouise Crow2013-09-16-2/+2
| | | | | | | | | | | | This should be handled by assign_variables_for_show_template. Otherwise, the make_request_summary_file method shouldn't depend on instance variables
| * Move zip file creation to its own method.Louise Crow2013-09-16-16/+15
| |
| * Remove hidden incoming messages from correspondence.txtLouise Crow2013-09-16-1/+2
| | | | | | | | | | | | | | Adds a spec for what we want to see - no message text in correspondence.txt, and no attachments. Refactors the simple_correspondence templates to make it clearer that these are doing the same job as the html.erb ones, for text.
| * Extract calculation of last update hashLouise Crow2013-09-16-2/+1
| |
| * Extract out code for making a request summary fileLouise Crow2013-09-16-26/+36
| | | | | | | | | | | | | | | | | | | | | | | | Render the show template within the current thread rather than making another request - we're going to need to use the current session in order to know what do include in the zip file, now that we have more fine-grained visibility of messages. Also, this will mean we can use this functionality in single threaded contexts, and test it more easily. Don't display profile photos as this would require another process, and hide other icons so we don't need to include them. Use render_to_string as a more standard way of rendering templates to a string for further manipulation.
| * Extract the various info_request assignsLouise Crow2013-09-16-9/+15
| | | | | | | | | | | | So we can reuse them when rendering the show template to a file. Lots of the sidebar prep isn't going to be needed for that view, so make that optional in the template.
| * Reorder assignsLouise Crow2013-09-16-12/+12
| | | | | | | | | | Split into those that come from request params and those that come from the model
| * Add new code and specs for hiding attachments.Louise Crow2013-09-16-1/+14
| |
* | Fix for #566. Also fix wrong identifier being used in text.Louise Crow2013-08-13-1/+1
|/
* Merge branch 'feature/similar-fixes' into rails-3-developLouise Crow2013-07-23-6/+0
|\
| * Change concatenated header and title strings to full, properly escaped ↵Louise Crow2013-07-22-6/+0
| | | | | | | | strings that are available for translation. Fixes #1003.
* | Merge remote-tracking branch ↵Louise Crow2013-07-23-0/+10
|\ \ | |/ |/| | | | | | | | | 'openaustralia_github/tests_set_described_state' into rails-3-develop Conflicts: spec/models/info_request_spec.rb
| * Now record a state_update event *whenever* a user classifies a requestMatthew Landauer2013-04-20-0/+10
| |
* | Allow the donation url to be configured. Closes #909.Louise Crow2013-06-07-2/+12
| |
* | Merge branch 'release/0.11' into rails-3-developLouise Crow2013-06-04-12/+19
|\ \
| * | Handle json requests for hidden info requests.Louise Crow2013-06-03-12/+19
| | |
* | | Merge remote-tracking branch ↵Louise Crow2013-06-04-19/+0
|\ \ \ | | | | | | | | | | | | 'openaustralia_github/more_info_on_report_request' into rails-3-develop
| * | | Move reporting actions to their own controllerMatthew Landauer2013-03-22-22/+0
| | | |
| * | | Extract methodMatthew Landauer2013-03-22-3/+1
| | | |
| * | | Only allow posts for reporting request. Don't try redirection when not logged inMatthew Landauer2013-03-22-9/+5
| | | |
| * | | Posted reason and message gets sent out in the emailMatthew Landauer2013-03-22-1/+1
| | | |
| * | | Only allow reporting a request when logged inMatthew Landauer2013-03-22-0/+5
| | | |
| * | | Add first pass at page for reporting a requestMatthew Landauer2013-03-22-0/+4
| | | |
* | | | Merge remote-tracking branch ↵Louise Crow2013-06-04-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | 'openaustralia_github/inline_search_method_refactor' into rails-3-develop
| * | | ActsAsXapian doesn't need to be referenced from the global namespaceMatthew Landauer2013-03-25-2/+2
| |/ /
* | | Only cache attachments that are returned with a 200 HTTP status codeMark Longair2013-05-24-1/+1
| | | | | | | | | | | | | | | | | | | | | Otherwise redirects will be cached, and since headers and the status code aren't stored, a non-redirecting redirect page will be returned in the future, but with 200. It's easiest to only cache the 200 responses.
* | | Check that display_filename matches URL part number or fallbackMark Longair2013-05-24-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the display_filename of the attachment found from the URL part number doesn't match the passed in display_filename then the email may have been reparsed, causing a reordering. In that case, look to see if there is another attachment that uniquely matches that filename, and, if so, return that other attachment. If no matching uniquely matching filename is found, redirect to the incoming message, rather than returning a 404.
* | | Move "require 'alaveteli_file_types'" into the initializerMark Longair2013-05-16-1/+0
| | |
* | | Merge branch 'rails-3-develop' of ↵Louise Crow2013-04-24-0/+1
|\ \ \ | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * | | Add encoding specifications to two files that use UTF-8Mark Longair2013-04-16-0/+1
| | |/ | |/| | | | | | | | | | Both of these files include multi-byte UTF-8 sequences, so should have a 'magic comment' specifying the encoding.
* | | Merge branch 'release/0.9' into rails-3-developLouise Crow2013-04-24-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock app/controllers/public_body_controller.rb app/mailers/track_mailer.rb app/views/request/_hidden_correspondence.html.erb app/views/request/_sidebar.html.erb app/views/request/hidden.html.erb app/views/request/new_please_describe.html.erb app/views/request/preview.html.erb app/views/user/show.html.erb config/environment.rb config/routes.rb spec/controllers/public_body_controller_spec.rb
| * | Merge branch 'feature/final-consistent-translation-interpolation' into developLouise Crow2013-04-16-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/outgoing_message.rb app/views/general/search.rhtml app/views/public_body/list.rhtml app/views/public_body/show.rhtml app/views/public_body/view_email.rhtml app/views/request/_after_actions.rhtml app/views/request/_followup.rhtml app/views/request/_sidebar.rhtml app/views/request/new.rhtml app/views/request/select_authority.rhtml app/views/request/upload_response.rhtml locale/aln/app.po locale/app.pot locale/ar/app.po locale/bs/app.po locale/ca/app.po locale/cs/app.po locale/cy/app.po locale/de/app.po locale/en/app.po locale/en_IE/app.po locale/es/app.po locale/eu/app.po locale/fr/app.po locale/gl/app.po locale/hu_HU/app.po locale/id/app.po locale/nb_NO/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sl/app.po locale/sq/app.po locale/sr@latin/app.po locale/tr/app.po locale/uk/app.po
| | * | Use {{}} not %s in translation.Louise Crow2013-04-09-1/+1
| | | |
| | * | Use {{}} instead of %s in url interpolation.Louise Crow2013-04-09-3/+3
| | | |
| * | | Set locale with I18n rather than through globalizeMatthew Landauer2013-04-02-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/general_controller.rb
* | | | Change email address in header of source code to hello@mysociety.orgMatthew Landauer2013-03-26-1/+1
| |_|/ |/| |