Skip to content

Commit

Permalink
Merge pull request #839 from arawa/fix/hide-menu-on-group-rename
Browse files Browse the repository at this point in the history
Well Done @acdmft 😉
  • Loading branch information
zak39 authored Aug 2, 2023
2 parents 008b3f4 + 5e47fac commit a2061d0
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 15 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added

- Close menu on group rename error message ([#839](https://github.com/arawa/workspace/pull/839))

### Fixed

- Fix/move v300 constant/stable3.0 ( [#845](https://github.com/arawa/workspace/pull/845) )
Expand Down
5 changes: 5 additions & 0 deletions docs/dev/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## [Unreleased]


### Added

- Close menu on group rename error message ([#839](https://github.com/arawa/workspace/pull/839))

### Fixed

- Fix workspace removal issue ( [#838](https://github.com/arawa/workspace/pull/838))
Expand Down
31 changes: 16 additions & 15 deletions src/GroupDetails.vue
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<!--
@copyright Copyright (c) 2017 Arawa
@copyright Copyright (c) 2017 Arawa

@author 2021 Baptiste Fotia <baptiste.fotia@arawa.fr>
@author 2021 Cyrille Bollu <[email protected]>
@author 2021 Baptiste Fotia <baptiste.fotia@arawa.fr>
@author 2021 Cyrille Bollu <[email protected]>

@license GNU AGPL version 3 or any later version
@license GNU AGPL version 3 or any later version

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<template>
Expand All @@ -39,7 +39,7 @@
</NcActionButton>
</NcActions>
</div>
<NcActions>
<NcActions ref="ncAction">
<NcActionButton v-if="!$store.getters.isGEorUGroup($route.params.space, $route.params.group)"
v-show="!showRenameGroupInput"
icon="icon-rename"
Expand Down Expand Up @@ -112,6 +112,7 @@ export default {
onRenameGroup(e) {
// Hides NcActionInput
this.toggleShowRenameGroupInput()
this.$refs.ncAction.opened = false

// Don't accept empty names
let group = e.target[0].value
Expand Down

0 comments on commit a2061d0

Please sign in to comment.