8000 Refactor how section ordering is handled by Bodacious · Pull Request #1837 · DMPRoadmap/roadmap · GitHub
[go: up one dir, main page]

Skip to content

Refactor how section ordering is handled #1837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Aug 28, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
fa32212
Extract template customizations into own controller
Bodacious Aug 22, 2018
f40be47
Refactor Template model methods
Bodacious Aug 22, 2018
d33c03e
Fix view logic in draggable sections
Bodacious Aug 22, 2018
7b1fe80
Add button for customising phase
Bodacious Aug 22, 2018
19c3ea4
Fix rubocop violations in GuidanceService
Bodacious Aug 22, 2018
a1d727e
Rename GuidanceService to GuidancePresenter
Bodacious Aug 22, 2018
f5bee2f
Fix bug in phase preview order sections
Bodacious Aug 22, 2018
66b0c6a
Refactor preview action/controller code
Bodacious Aug 22, 2018
a6f40bf
Fix Section ordering in various views
Bodacious Aug 22, 2018
a361c1f
Fix rubocop violations
Bodacious Aug 22, 2018
3703bf7
Fix bug forcing Phases to be modifiable
Bodacious Aug 22, 2018
10000 f469e4b
Fix broken tests
Bodacious Aug 23, 2018
525c178
Update method to check if section is draggable
Bodacious Aug 23, 2018
8d1fe15
Extract copy action into its own resource
Bodacious Aug 23, 2018
3d1ea64
Extract customization transfers to own controller
Bodacious Aug 23, 2018
e45f733
Remove redundant routing condition
Bodacious Aug 23, 2018
d824bd1
Fix Rubocop violation issues
Bodacious Aug 23, 2018
a7ff152
Change condition for section draggable
Bodacious Aug 23, 2018
f57d201
Refactor instance variable in PlansController
Bodacious Aug 23, 2018
dd55261
Fix broken tests
Bodacious Aug 27, 2018
1e44d0b
Add test support for 'de' locale
Bodacious Aug 27, 2018
1edf690
Merge branch 'development' into refactor/section-reordering
Bodacious Aug 27, 2018
61000f6
Fix merge issue in plans controller
Bodacious Aug 28, 2018
0a3a200
Fix broken specs in plan#request_feedback
Bodacious Aug 28, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix Rubocop violation issues
  • Loading branch information
Bodacious committed Aug 23, 2018
commit d824bd18525f5cf6bab6b70e168436bfa9ea1cb9
6 changes: 5 additions & 1 deletion app/controllers/concerns/template_methods.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# frozen_string_literal: true

# This module holds helper controller methods for controllers that deal with Templates
#
module TemplateMethods

private
Expand All @@ -6,4 +10,4 @@ def template_type(template)
template.customization_of.present? ? _("customisation") : _("template")
end

end
end
2 changes: 2 additions & 0 deletions app/controllers/org_admin/template_copies_controller.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

class OrgAdmin::TemplateCopiesController < ApplicationController

include TemplateMethods
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

class OrgAdmin::TemplateCustomizationTransfersController < ApplicationController

after_action :verify_authorized
Expand Down
2 changes: 0 additions & 2 deletions app/helpers/org_admin/template_copies_helper.rb

This file was deleted.

This file was deleted.

0