a5056224d1
Previously, if the server did not return enabled=true for the rebase change action, the rebase button would be disabled on the UI. Really, what disabled indicated in this case was that the rebase could not be performed on the current branch, but could still perform a rebase on a different parent revision. This change updates revision actions in the change view always be enabled, and introduces a new parameter to indicate whether or not rebasing should be enabled on the current branch based on the initial status of the enabled flag. This change also disables the rebase button on the rebase dialog until an option is explicitly chosen. Previously, if an option was not chosen, if rebase was clicked, it would submit with a base branch of '', which is the same thing checking the box accomplishes. Now, either the box must be checked, or a base change must be entered, so it is more clear what happens with the rebase and in the new scenario when you cannot submit on the base branch, there won't be a possibility of a server error. Bug: Issue 5126 Change-Id: I47083ad328095aad4e04f2fc1586ad4d34412e4c
66 lines
1.8 KiB
HTML
66 lines
1.8 KiB
HTML
<!--
|
|
Copyright (C) 2016 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
|
|
<link rel="import" href="../../../bower_components/polymer/polymer.html">
|
|
<link rel="import" href="../gr-button/gr-button.html">
|
|
|
|
<dom-module id="gr-confirm-dialog">
|
|
<template>
|
|
<style>
|
|
:host {
|
|
display: block;
|
|
max-height: 90vh;
|
|
}
|
|
.container {
|
|
display: flex;
|
|
flex-direction: column;
|
|
max-height: 90vh;
|
|
}
|
|
header {
|
|
border-bottom: 1px solid #ddd;
|
|
flex-shrink: 0;
|
|
font-weight: bold;
|
|
}
|
|
main {
|
|
display: flex;
|
|
flex-shrink: 1;
|
|
width: 100%;
|
|
}
|
|
header,
|
|
main,
|
|
footer {
|
|
padding: .5em .65em;
|
|
}
|
|
footer {
|
|
display: flex;
|
|
flex-shrink: 0;
|
|
justify-content: space-between;
|
|
}
|
|
</style>
|
|
<div class="container">
|
|
<header><content select=".header"></content></header>
|
|
<main><content select=".main"></content></main>
|
|
<footer>
|
|
<gr-button primary on-tap="_handleConfirmTap" disabled="[[disabled]]">
|
|
[[confirmLabel]]
|
|
</gr-button>
|
|
<gr-button on-tap="_handleCancelTap">Cancel</gr-button>
|
|
</footer>
|
|
</div>
|
|
</template>
|
|
<script src="gr-confirm-dialog.js"></script>
|
|
</dom-module>
|