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

wth - organization lock warning message #767

Merged
merged 1 commit into from Dec 5, 2016

Conversation

wtholt
Copy link
Contributor

@wtholt wtholt commented Nov 30, 2016

I updated the locked organization warning message to be more helpful to
the user. I added a new controller action that requests the necessary
data and moved some pieces around that I feel reflects a more MVC
approach. [#134877103]

@@ -0,0 +1,10 @@
class LockedOrganizationsController < ApplicationController
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add the copyright statement?

@@ -0,0 +1,2 @@
$('#modal_place').html("<%= j render 'service_requests/modals/locked_organization_modal', organization: @organization, identity: @identity, protocol: @protocol, ssr: @ssr %>")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add the copyright statement?

I updated the locked organization warning message to be more helpful to
the user. I added a new controller action that requests the necessary
data and moved some pieces around that I feel reflects a more MVC
approach. [#134877103]
@wtholt wtholt force-pushed the wth-organization-lock-message branch from d1c0494 to 43f91d7 Compare December 1, 2016 15:50
@jleonardw9 jleonardw9 merged commit a264da3 into master Dec 5, 2016
@jleonardw9 jleonardw9 deleted the wth-organization-lock-message branch December 5, 2016 13:13
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.

None yet

4 participants