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

Add cancel button for when user entry is being edited #38952

Closed
wants to merge 4 commits into from
Closed

Add cancel button for when user entry is being edited #38952

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcdbaf3
Add cancel button for when user entry is being edited
JeaNugroho Jun 23, 2023
9806b42
Update apps/settings/src/components/Users/UserRow.vue
JeaNugroho Jun 25, 2023
d2b2fc3
Omit bind property for more than one inside NcActions
JeaNugroho Jun 25, 2023
fc87865
Omit conflict markers
JeaNugroho Jul 4, 2023
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
26 changes: 26 additions & 0 deletions apps/settings/src/components/Users/UserRow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,36 @@
</div>

<div class="userActions">
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<<<<<<< HEAD

Another conflict marker

<UserRowActions v-if="!loading.all"
:actions="userActions"
:edit="true"
@update:edit="toggleEdit" />
=======
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
=======

Conflict.

<div v-if="!loading.all"
class="toggleUserActions">
<NcActions>
<NcActionButton icon="icon-close"
:title="t('settings', 'Cancel')"
:aria-label="t('settings', 'Cancel')"
@click="editing = false" />
</NcActions>
<div v-click-outside="hideMenu" class="userPopoverMenuWrapper">
<button class="icon-more"
:aria-expanded="openedMenu"
:aria-label="t('settings', 'Toggle user actions menu')"
@click.prevent="toggleMenu" />
<div :class="{ 'open': openedMenu }" class="popovermenu">
<NcPopoverMenu :menu="userActions" />
</div>
</div>
</div>
<div :style="{opacity: feedbackMessage !== '' ? 1 : 0}"
class="feedback">
<div class="icon-checkmark" />
{{ feedbackMessage }}
</div>
>>>>>>> 7a2938b01f3 (Add cancel button for when user entry is being edited)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
>>>>>>> 7a2938b01f3 (Add cancel button for when user entry is being edited)

Merge conflict, and deleting this line is not the solution though you want to work with perhaps your code editor to help you resolve the conflicts.

</div>
</div>
</template>
Expand Down