Repository: ignite Updated Branches: refs/heads/master 982263e17 -> adcf3a39a
IGNITE-9862 Minor fixes. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/adcf3a39 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/adcf3a39 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/adcf3a39 Branch: refs/heads/master Commit: adcf3a39ab00a341e7d6fb99a04ed5bc9afc9e98 Parents: 982263e Author: Alexey Kuznetsov <[email protected]> Authored: Wed Oct 17 15:43:52 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Oct 17 15:43:52 2018 +0700 ---------------------------------------------------------------------- .../frontend/app/components/input-dialog/input-dialog.tpl.pug | 1 + .../frontend/app/modules/agent/AgentManager.service.js | 3 +-- .../web-console/frontend/app/primitives/timepicker/index.pug | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/adcf3a39/modules/web-console/frontend/app/components/input-dialog/input-dialog.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/input-dialog/input-dialog.tpl.pug b/modules/web-console/frontend/app/components/input-dialog/input-dialog.tpl.pug index 0d0d5ca..4674c97 100644 --- a/modules/web-console/frontend/app/components/input-dialog/input-dialog.tpl.pug +++ b/modules/web-console/frontend/app/components/input-dialog/input-dialog.tpl.pug @@ -86,6 +86,7 @@ include /app/helpers/jade/mixins .form-field--inline +form-field__timepicker({ model: 'ctrl.options.value', + format: '{{ ctrl.options.format }}', name: '"time"' }) .modal-footer http://git-wip-us.apache.org/repos/asf/ignite/blob/adcf3a39/modules/web-console/frontend/app/modules/agent/AgentManager.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js index e44ac9b..8f02177 100644 --- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js +++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js @@ -44,8 +44,7 @@ const IGNITE_2_0 = '2.0.0'; const LAZY_QUERY_SINCE = [['2.1.4-p1', '2.2.0'], '2.2.1']; const COLLOCATED_QUERY_SINCE = [['2.3.5', '2.4.0'], ['2.4.6', '2.5.0'], ['2.5.1-p13', '2.6.0'], '2.7.0']; -// Error codes from o.a.i.internal.processors.restGridRestResponse.java - +/** Error codes from o.a.i.internal.processors.restGridRestResponse.java */ const SuccessStatus = { /** Command succeeded. */ STATUS_SUCCESS: 0, http://git-wip-us.apache.org/repos/asf/ignite/blob/adcf3a39/modules/web-console/frontend/app/primitives/timepicker/index.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/primitives/timepicker/index.pug b/modules/web-console/frontend/app/primitives/timepicker/index.pug index 5e3936c..f97a5a2 100644 --- a/modules/web-console/frontend/app/primitives/timepicker/index.pug +++ b/modules/web-console/frontend/app/primitives/timepicker/index.pug @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. -mixin form-field__timepicker({ label, model, name, mindate, maxdate, disabled, required, placeholder, tip }) +mixin form-field__timepicker({ label, model, name, mindate, maxdate, disabled, required, placeholder, tip, format = 'HH:mm'}) mixin __form-field__timepicker() input( id=`{{ ${name} }}Input` @@ -28,9 +28,10 @@ mixin form-field__timepicker({ label, model, name, mindate, maxdate, disabled, r ng-disabled=disabled && `${disabled}` bs-timepicker - data-time-format='HH:mm' + data-time-format=format data-length='1' data-minute-step='1' + data-second-step='1' data-arrow-behavior='picker' data-placement='bottom'
