Fixes #6912/BZ 1126446 - Sync Plan enabled by default, #4651
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
xprazak2
force-pushed
the
bug6912-sync-plan-model-change
branch
2 times, most recently
from
5fd17cb
to
33f20ba
Compare
| @@ -29,7 +29,7 @@ angular.module('Bastion.sync-plans').controller('SyncPlanDetailsInfoController', | |||
| function ($scope, $q, translate, SyncPlan, MenuExpander) { | |||
| $scope.successMessages = []; | |||
| $scope.errorMessages = []; | |||
| $scope.intervals = ['none', 'hourly', 'daily', 'weekly']; | |||
| $scope.intervals = [translate('hourly'), translate('daily'), translate('weekly')]; | |||
There was a problem hiding this comment.
I don't think you want to mark these for translation as they need to match up with these: https://github.com/Katello/katello/pull/4651/files#diff-cbbf4a31420b097c086fac10249ad959L25
Poor design to use a string that is then displayed to the user. In order to get these translated we could use a filter, but I am fine doing that in another PR. For this PR, please just revert this line.
There was a problem hiding this comment.
I did not realize, it should be fixed now.
xprazak2
force-pushed
the
bug6912-sync-plan-model-change
branch
from
33f20ba
to
829a49d
Compare
| @@ -1478,3 +1478,7 @@ ul { | |||
| list-style: none; | |||
| margin: 0; | |||
| } | |||
|
|
|||
| .gray{ | |||
There was a problem hiding this comment.
Is this used anywhere?
There was a problem hiding this comment.
When sync plan is disabled, interval on details page is in gray
…x to disable on edit
xprazak2
force-pushed
the
bug6912-sync-plan-model-change
branch
from
829a49d
to
9291c47
Compare
|
Error message should be fixed now |
|
ACK |
waldenraines
pushed a commit
that referenced
this pull request
Sep 23, 2014
Fixes #6912/BZ 1126446 - Sync Plan enabled by default,
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.
checkbox to disable on edit