aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeLines
* Sanitize the blog contents0.20.0.2Louise Crow2014-12-22-2/+2
|
* Sanitize the contents of HTML attachments before displayLouise Crow2014-12-22-0/+4
|
* Fix unvalidated redirectsGareth Rees2014-12-22-3/+3
|
* Try to avoid n+1 queries, and multiple admin authority queries.0.20.0.1hotfix/0.20.0.1Louise Crow2014-12-18-2/+3
| | | | Attempting to make the import faster when there are lots of public authorities in the database already
* Don't translate validation messages for models created/edited in admin interfacerelease/0.20Louise Crow2014-12-02-8/+8
|
* Fix for interpolation bug introduced in ↵Louise Crow2014-12-01-1/+11
| | | | | | | 7a3b462f41321034cbdd2c83707f739a442e83c6. The string with the unsubstituted variable pattern was being made available for translation, instead of the translatable version.
* Merge branch '2000-validate-category-description' into rails-3-developLouise Crow2014-12-01-0/+1
|\
| * Validate the presence of the description.Louise Crow2014-12-01-0/+1
| | | | | | | | It's required in [PublicBody#type_of_authority]( https://github.com/mysociety/alaveteli/blob/rails-3-develop/app/models/public_body.rb#L343-L347)
* | Merge branch '1965-censor-rule-creation-failure' into rails-3-developLouise Crow2014-12-01-23/+54
|\ \ | |/ |/|
| * Remove redundant hidden fieldsGareth Rees2014-12-01-2/+0
| | | | | | | | | | | | | | | | | | Now that the form submits to a URL containing the parent object’s id these are no longer required See: - 259a0fd588e198d2a826ef4ac09284c610005387 - d5c7e08d58dc5ad52f16eccd9c456543503e4360
| * Use instance variable for CensorRule in #destroyGareth Rees2014-11-19-6/+9
| | | | | | | | | | | | Easier to check against the assigned variable, but the spec still fails because an internal error is raised if the rule is not associated with a User or InfoRequest
| * Use new routes for creating censor rulesGareth Rees2014-11-19-10/+10
| | | | | | | | | | | | | | | | | | | | - Use resource-oriented form style, building against the censor rule instance created in the controller - Use the URL assigned by the controller based on what the censor rule is being created against - Use the new route for the buttons directing the admin to the form - Use consistent styling for button labelling - Use each instead of for
| * Tidy AdminCensorRuleController#updateGareth Rees2014-11-19-3/+7
| | | | | | | | | | | | - Add linebreaks to break up sections - Remove unused parentheses - Use unless instead of if !
| * Set the form URL to POST to in #createGareth Rees2014-11-19-0/+3
| | | | | | | | | | | | Direct the (re-rendered) form at the correct route for the association (or use the generic route if the rule is being created for some other reason)
| * Associate censor rule with something in #createGareth Rees2014-11-19-2/+17
| | | | | | | | | | Build the CensorRule against the object that is found by an additional parameter (either :info_request_id or :user_id)
| * Set the form URL to POST to in #newGareth Rees2014-11-19-0/+4
| | | | | | | | | | Direct the form at the correct route for the association (or use the generic route if the rule is being created for some other reason)
| * Associate censor rule with something in #newGareth Rees2014-11-19-0/+2
| | | | | | | | | | Build the CensorRule against the object that is found by an additional parameter (either :info_request_id or :user_id)
| * Initialize a new CensorRule in #newGareth Rees2014-11-19-0/+2
| |
* | Merge branch 'rails-3-develop' of ↵Louise Crow2014-11-27-37/+43
|\ \ | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * | Add JS confirmation for deleting heading/categoryGareth Rees2014-11-20-2/+4
| | |
| * | Fix incorrect count for heading childrenGareth Rees2014-11-20-1/+1
| | | | | | | | | | | | | | | Was initially counting the number of headings rather than the number of categories inside each heading.
| * | Tidy public body category management UIGareth Rees2014-11-20-36/+40
| | | | | | | | | | | | | | | | | | | | | | | | Make the forms for editing categories and category headings more uniform with other admin pages - Put the dangerous actions in a well - Remove large well for returning to the index page
* | | Merge branch 'close-update-public-body' into rails-3-developLouise Crow2014-11-27-0/+3
|\ \ \ | |/ / |/| |
| * | Adds button missing from 921ee9a19c267bb0e6e784091b985f3ba80d835bLouise Crow2014-11-18-0/+3
| | |
* | | Merge branch 'issues/1969-inconsistent-public-body-admin-interface' into ↵Gareth Rees2014-11-19-45/+38
|\ \ \ | | | | | | | | | | | | rails-3-develop
| * | | Remove restricton on deleting PublicBodyHeadings with associated ↵lizconlan2014-11-19-28/+21
| | | | | | | | | | | | | | | | PublicBodyCategories
| * | | Fix view bug preventing PublicBodyCategories being deleted in the admin ↵lizconlan2014-11-19-17/+17
| |/ / | | | | | | | | | interface
* | / Use badge to show number of categories in headingGareth Rees2014-11-18-3/+6
| |/ |/| | | | | | | | | | | | | | | | | | | | | The chevron didn't illustrate that the heading had any category children. The app uses the badge pattern elsewhere. Adds minor style improvements: - Pad erb tags - Use each instead of for Fixes https://github.com/mysociety/alaveteli/issues/1962
* | Merge branch '1968-disable-category-tag-field' into rails-3-developGareth Rees2014-11-18-9/+16
|\ \
| * | Disable rather than hide form fields that can’t be modifiedGareth Rees2014-11-17-9/+16
| |/ | | | | | | | | | | | | | | Not clear to the user why the form field is sometimes present and sometimes not present. The Category tag field may only be modified if authorities have not yet been assigned to the Category. This commit explains this and disables the field if this is true.
* | Use flash[:error] for error conditionGareth Rees2014-11-18-1/+1
| | | | | | Also use double quotes rather than string escaping
* | Redirect to #edit after updatingGareth Rees2014-11-17-4/+7
| | | | | | | | | | On an unsuccessful update AdminPublicBodyHeadingsController and AdminPublicBodyCategoriesController #update should render the #edit action.
* | Redirect to #edit after updatingGareth Rees2014-11-17-2/+3
|/ | | | | | | On a successful update AdminPublicBodyHeadingsController and AdminPublicBodyCategoriesController #update should redirect to the #edit action rather than simply rendering the ‘edit’ template. Fixes https://github.com/mysociety/alaveteli/issues/1977
* Fix missing translation introduced in 962357cGareth Rees2014-11-12-3/+3
| | | | | 962357c tidied the translation but left the translation call (`_()`) around the variable rather than the string literal.
* Revert text changes in bf31b10Gareth Rees2014-11-12-2/+2
| | | | | | Further work on redesigning the request process [1] will reword these lines, so don't make the translators do work for no gain. [1] https://github.com/mysociety/alaveteli/issues/1526
* Revert text changes in 8a21f27Gareth Rees2014-11-12-2/+2
| | | | | | | Further work on redesigning the request process [1] will reword these lines, so don't make the translators do work for no gain. [1] https://github.com/mysociety/alaveteli/issues/1526
* Merge branch '1433-admin-bottom-margin' into rails-3-developGareth Rees2014-11-11-1/+1
|\
| * Add margin to bottom of admin viewsGareth Rees2014-11-05-1/+1
| | | | | | Prevents the pagination being squashed up against the window edge
* | Merge branch '1663-split-select-authority-page' into rails-3-developGareth Rees2014-11-10-101/+71
|\ \
| * | Move “Can’t find an authority” to sidebarGareth Rees2014-10-30-1/+42
| | | | | | | | | | | | | | | Move the “Can’t find an authority” actions on the /select_authority page to the right of the search results
| * | Improve /select_authority search boxGareth Rees2014-10-30-1/+8
| | | | | | | | | | | | | | | | | | - Make it wider - Add a placeholder - Translate placeholder and title text
| * | Tidy up request/select_authority.html.erbGareth Rees2014-10-30-23/+26
| | | | | | | | | | | | | | | | | | | | | | | | - Align indentation - Use named path for form url - Use %Q() to avoid string escaping - Use :anchor option to link to help page section - Use symbols for form tag names
| * | Remove authority preview from /select_authorityGareth Rees2014-10-30-88/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Clicking a search result now takes the user directly to the authority show page. Removes the step numbers from the headers as the show page interrupts the flow and seems pointless to add workarounds in public_body/show just for this.
* | | Merge branch 'issues/1437-apple-mail-attachment-parsing' into rails-3-developGareth Rees2014-11-10-2/+4
|\ \ \
| * | | Add fix for Apple Mail with attachments Gareth Rees2014-11-04-2/+4
| | |/ | |/|
* / | Redirect /help to /help/aboutGareth Rees2014-11-05-0/+4
|/ / | | | | | | Shouldn't really 404 on an important/accessible URL
* | Merge branch '875-remove-charities' into rails-3-developGareth Rees2014-10-30-10/+0
|\ \
| * | Remove WDTK-specific charity linksGareth Rees2014-10-29-10/+0
| |/ | | | | These will be moved to whatdotheyknow-theme
* | Merge branch 'issues/1457-close-change-request-without-email' into ↵Louise Crow2014-10-30-11/+12
|\ \ | |/ |/| | | rails-3-develop
| * Remove redirect to trailing slash URL.Louise Crow2014-10-30-7/+0
| | | | | | | | | | Introduced in 4f501309ade230f65f4ba45e1d0161e89587d755 but no longer needed as we don't proxy the admin interface.
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-08 04:21:53 +0000