Skip to content
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

Restore views for Admin::EventsController#new, Admin::UsersController#edit #3129

Merged
merged 5 commits into from
May 4, 2023

Conversation

AndrewKvalheim
Copy link
Member

@AndrewKvalheim AndrewKvalheim commented Mar 1, 2023

Checklist

  • I have read the Contribution & Best practices Guide.
  • My branch is up-to-date with the upstream master branch.
  • The tests pass locally with my changes.
  • I have added tests that prove my fix is effective or that my feature works.
  • I have added necessary documentation (if appropriate).

Short description of what this resolves

#2975

Changes proposed in this pull request

While #3073 and #3092 also attempt to solve this issue, both introduce UI changes that are out of scope of the task of merely undoing the inadvertent deletion. I suggest that the forms first be restored to their original condition and then the remaining UI changes be discussed in their respective issues.

Deleted (3bbbdb4) Restored (e00eecc)
3bbbdb4 /admin/users/2/edit e00eecc /admin/users/2/edit
3bbbdb4 /admin/conferences/example/program/events/new e00eecc /admin/conferences/example/program/events/new

@AndrewKvalheim AndrewKvalheim force-pushed the restore-views branch 2 times, most recently from cf06048 to e00eecc Compare March 1, 2023 02:13
In openSUSE#2987 the detailed view of the event form was inadvertently lost,
presumably due to openSUSE#2975 masking the problem.
Fails with:

    1) User admin behaves like admin ability edits a user
       Failure/Error: raise ActionController::MissingExactTemplate, message

       ActionController::MissingExactTemplate:
         Admin::UsersController#edit is missing a template for request formats: text/html

re openSUSE#2975
Fails with:

    1) Event as an conference organizer create a proposal
       Failure/Error: raise ActionController::MissingExactTemplate, message

       ActionController::MissingExactTemplate:
         Admin::EventsController#new is missing a template for request formats: text/html

re openSUSE#2975
…ler#edit

 1. Restore views lost during 81853d1:

        git restore --source 4a16836 \
          app/views/admin/users/_form.html.haml \
          app/views/application/edit.html.haml \
          app/views/application/new.html.haml
        mv app/views/application/edit.html.haml app/views/admin/users/
        mv app/views/application/new.html.haml app/views/admin/events/

 2. Convert from Formtastic:

      - app/views/admin/users/_form.html.haml

 3. Add header as in 81853d1:

      - app/views/admin/events/new.html.haml

 4. Substitute partial unified in 88b5596:

      - app/views/admin/events/new.html.haml

resolves openSUSE#2975
@hennevogel hennevogel merged commit fc507e8 into openSUSE:master May 4, 2023
@AndrewKvalheim AndrewKvalheim deleted the restore-views branch May 4, 2023 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants