Fixing Council pages, #150
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| params.fetch(:album,{}).permit(:title,:description,:author,:location,:public,:start_date,:end_date,:album_category_ids => [],:subcategory_ids => [],images_parameters: [:id, :foto]) | ||
| params.fetch(:album, {}).permit(:title, :description, :author, :location, | ||
| :public, :start_date, :end_date, album_category_ids: [], | ||
| subcategory_ids: [], images_parameters: [:id, :foto]) |
There was a problem hiding this comment.
Align the elements of a hash literal if they span more than one line.
| params.fetch(:album,{}).permit(:title,:description,:author,:location,:public,:start_date,:end_date,:album_category_ids => [],:subcategory_ids => [],images_parameters: [:id, :foto]) | ||
| params.require(:album).permit(:title, :description, :author, :location, | ||
| :public, :start_date, :end_date, album_category_ids: [], | ||
| subcategory_ids: [], images_parameters: [:id, :foto]) |
There was a problem hiding this comment.
Align the elements of a hash literal if they span more than one line.
Closed
| elsif i == 2 | ||
| return self.end | ||
| case view_status | ||
| when :before |
| belongs_to :page | ||
| has_attached_file :picture, | ||
| styles: { original: '4000x4000>', large: '1500x1500>', | ||
| small: '250x250>', thumb: '100x100>' }, |
There was a problem hiding this comment.
Align the elements of a hash literal if they span more than one line.
| can :manage, Candidate, profile_id: user.profile.id | ||
| can :manage, Nomination | ||
| can [:show,:avatar], Profile |
| @@ -18,15 +20,21 @@ class Profile < ActiveRecord::Base | |||
| validates :name, :lastname, presence: true, on: :update | |||
| validates :start_year, inclusion: { in: 1954..(Time.zone.today.year + 1) }, on: :update | |||
|
|
|||
| scope :search_names, ->(name,lastname) { where('name LIKE ? AND lastname LIKE ?',"%#{name}%","%#{lastname}%")} | |||
There was a problem hiding this comment.
Line is too long. [112/100]
Space missing after comma.
Space missing inside }.
| @@ -16,17 +18,25 @@ class Profile < ActiveRecord::Base | |||
| validates_attachment_content_type :avatar, content_type: /\Aimage\/.*\Z/ | |||
| # Only on update! | |||
| validates :name, :lastname, presence: true, on: :update | |||
| validates :start_year, inclusion: { in: 1954..(Time.zone.today.year + 1) }, on: :update | |||
| validates :start_year, inclusion: {in: 1954..(Time.zone.today.year + 1)}, on: :update | |||
There was a problem hiding this comment.
Space inside { missing.
Space inside } missing.
davidwessman
added a commit
that referenced
this pull request
Apr 6, 2015
Fixing Council pages and lots of other things.
|
This PR was deployed to Production. Reference: 83f5b59 |
|
The page link on the edit page doesn't work. |
This was referenced Apr 6, 2015
Closed
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Removes all mentions of the_role actions, fixing old controllers.
Album-, workpost-controllers are not in used at the moment and I will not implement tests for them now.