Repository navigation
Fixes #30034 - Adding markdown for login message - #7725
patilsuraj767 wants to merge 4 commits into
Conversation
|
Can one of the admins verify this patch? |
2 similar comments
|
Can one of the admins verify this patch? |
|
Can one of the admins verify this patch? |
|
Issues: #30034 |
bf073ad to
65b2f35
Compare
|
ok to test |
kgaikwad
left a comment
kgaikwad
left a comment
There was a problem hiding this comment.
Thanks @patilsuraj767!
Added few inline comments and queries.
| set('db_pending_seed', N_("Should the `foreman-rake db:seed` be executed on the next run of the installer modules?"), true, N_('DB pending seed')), | ||
| set('proxy_request_timeout', N_("Open and read timeout for HTTP requests from Foreman to Smart Proxy (in seconds)"), 60, N_('Smart Proxy request timeout')), | ||
| set('login_text', N_("Text to be shown in the login-page footer"), nil, N_('Login page footer text')), | ||
| set('login_text', N_("Text to be shown in the login-page footer"), nil, N_('Login page footer text'), nil, {:field => 'textarea'}), |
There was a problem hiding this comment.
Instead of option key field, why you are not passing settings_type key?
There was a problem hiding this comment.
Make sense in naming option key to settings_type. I will make the changes.
|
|
||
| placeholder = setting.has_default? ? setting.default : "No default value was set" | ||
| return edit_textarea(setting, :value, {:title => setting.full_name_with_default, :helper => :show_value, :placeholder => placeholder}) if setting.settings_type == 'array' | ||
| return edit_textarea(setting, :value, {:title => setting.full_name_with_default, :helper => :show_value, :placeholder => placeholder}) if setting.settings_type == 'array' || setting.settings_type == 'textarea' |
There was a problem hiding this comment.
| return edit_textarea(setting, :value, {:title => setting.full_name_with_default, :helper => :show_value, :placeholder => placeholder}) if setting.settings_type == 'array' || setting.settings_type == 'textarea' | |
| return edit_textarea(setting, :value, {:title => setting.full_name_with_default, :helper => :show_value, :placeholder => placeholder}) if ['array', 'textarea'].include?(setting.settings_type) |
| graphql_type '::Types::Setting' | ||
|
|
||
| TYPES = %w{integer boolean hash array string} | ||
| TYPES = %w{integer boolean hash array string textarea} |
There was a problem hiding this comment.
Not sure, As per my understanding def has_default? on line-324 is only used to set the title of the textarea. As by default login message is not set title is rendering correctly to Default: Not set.
| "jed": "^1.1.1", | ||
| "react-intl": "^2.8.0" | ||
| "react-intl": "^2.8.0", | ||
| "react-markdown": "^4.3.1" |
There was a problem hiding this comment.
can you please add this dependency to @theforeman/vendor?
https://github.com/theforeman/foreman-js/tree/master/packages/vendor-core
There was a problem hiding this comment.
@amirfefer I have created the PR in foreman-js but Travis is failing due to something.
Can you help? Do I also need to upload package-lock.json?
There was a problem hiding this comment.
I see that the PR is merged 👍
can you please bump foreman-js sub-packages to version 4.7.0 and remove react-markdown?
| "jed": "^1.1.1", | ||
| "react-intl": "^2.8.0" | ||
| "react-intl": "^2.8.0", | ||
| "react-markdown": "^4.3.1" |
There was a problem hiding this comment.
I see that the PR is merged 👍
can you please bump foreman-js sub-packages to version 4.7.0 and remove react-markdown?
|
@amirfefer, @patilsuraj767, |
|
@patilsuraj767 , @kgaikwad - what is the status here? |
Yes, we can close this for now. |
5 participants
Added markdown support for login message.