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.

Sign up for GitHub

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

Compare Save Dialog, simplify #7612

Merged
merged 1 commit into from
Sep 8, 2022
Merged

Compare Save Dialog, simplify #7612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions packages/web-app-user-management/src/components/Groups/SideBar/EditPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
:fix-message-line="true"
@input="validateDisplayName"
/>
<compare-save-dialog
class="edit-compare-save-dialog oc-mb-l"
:original-object="group"
:compare-object="editGroup"
:confirm-button-disabled="invalidFormData"
@revert="revertChanges"
@confirm="$emit('confirm', editGroup)"
></compare-save-dialog>
</div>
<compare-save-dialog
class="edit-compare-save-dialog oc-pb-l oc-pt-s oc-px-m"
:original-object="group"
:compare-object="editGroup"
:confirm-button-disabled="invalidFormData"
@revert="revertChanges"
@confirm="$emit('confirm', editGroup)"
></compare-save-dialog>
</div>
</template>
<script>
Expand Down
24 changes: 10 additions & 14 deletions packages/web-app-user-management/src/components/Users/SideBar/EditPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
</div>
<quota-select
v-if="showQuota"
class="oc-mb-s"
:key="'quota-select-' + user.id"
:title="$gettext('Personal quota')"
:total-quota="editUser.drive.quota.total || 0"
Expand All @@ -49,15 +50,15 @@
To set an individual quota, the user needs to have logged in once.
</p>
</div>
<compare-save-dialog
class="edit-compare-save-dialog oc-mb-l"
:original-object="user"
:compare-object="editUser"
:confirm-button-disabled="invalidFormData"
@revert="revertChanges"
@confirm="$emit('confirm', editUser)"
></compare-save-dialog>
</div>
<compare-save-dialog
class="edit-compare-save-dialog oc-pb-l oc-pt-s oc-px-m"
:original-object="user"
:compare-object="editUser"
:confirm-button-disabled="invalidFormData"
@revert="revertChanges"
@confirm="$emit('confirm', editUser)"
></compare-save-dialog>
</div>
</template>
<script>
Expand Down Expand Up @@ -160,12 +161,7 @@ export default {
<style lang="scss">
#user-edit-panel {
#user-edit-form {
border-top-left-radius: 5px;
border-top-right-radius: 5px;
}
.edit-compare-save-dialog {
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
border-radius: 5px;
}
}
</style>
22 changes: 9 additions & 13 deletions packages/web-app-user-management/src/components/Users/SideBar/GroupAssignmentsPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<UserInfoBox :user="user" />
<div id="user-group-assignment-form" class="oc-background-highlight oc-p-m">
<oc-select
class="oc-mb-s"
v-model="editUser.memberOf"
multiple
:options="groups"
Expand Down Expand Up @@ -35,14 +36,14 @@
</div>
</template>
</oc-select>
<compare-save-dialog
class="edit-compare-save-dialog oc-mb-l"
:original-object="user"
:compare-object="editUser"
@revert="revertChanges"
@confirm="$emit('confirm', editUser)"
></compare-save-dialog>
</div>
<compare-save-dialog
class="edit-compare-save-dialog oc-pb-l oc-pt-s oc-px-m"
:original-object="user"
:compare-object="editUser"
@revert="revertChanges"
@confirm="$emit('confirm', editUser)"
></compare-save-dialog>
</div>
</template>
<script>
Expand Down Expand Up @@ -90,12 +91,7 @@ export default {
<style lang="scss">
#user-group-assignment-panel {
#user-group-assignment-form {
border-top-left-radius: 5px;
border-top-right-radius: 5px;
}
.edit-compare-save-dialog {
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
border-radius: 5px;
}
}
</style>