Skip to content

Commit

Permalink
Merge pull request #705 from arawa/backport/disable-convert-groupfold…
Browse files Browse the repository at this point in the history
…ers/703/stable24

Backport : Disable the conversion feature stable24
  • Loading branch information
zak39 authored Jan 30, 2023
2 parents 6524d74 + 606c948 commit cc68e46
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
6 changes: 1 addition & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [1.3.2] - 2023-01-27

### Added

- Add coding standard ( [#624](https://github.com/arawa/workspace/pull/624) )
- Init the .editorconfig file ( [#625](https://github.com/arawa/workspace/pull/625) )

### Changed

- Create the register function ( [#649](https://github.com/arawa/workspace/pull/649) )
- Fix the pattern to check special char ( [#648](https://github.com/arawa/workspace/pull/648) )
- Replace constants ( [#589](https://github.com/arawa/workspace/pull/589))
- Backport : Disable the conversion feature stable24 ( [#705](https://github.com/arawa/workspace/pull/705) )

### Chore

Expand Down
14 changes: 9 additions & 5 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,15 @@
'url' => '/spaces',
'verb' => 'POST'
],
[
'name' => 'group#transferUsersToGroups',
'url' => '/spaces/{spaceId}/transfer-users',
'verb' => 'POST'
],
/**
* @todo Decomment these lines to convert a groupfolder to workspace.
* This may be possible from NC25 or NC26.
*/
// [
// 'name' => 'group#transferUsersToGroups',
// 'url' => '/spaces/{spaceId}/transfer-users',
// 'verb' => 'POST'
// ],
[
'name' => 'space#find',
'url' => '/workspaces/{id}',
Expand Down
16 changes: 8 additions & 8 deletions src/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</AppNavigationItem>
</div>
</AppNavigationItem>
<div id="app-settings">
<!-- <div id="app-settings">
<div id="app-settings-header">
<button v-if="$root.$data.isUserGeneralAdmin === 'true'"
icon="icon-settings-dark"
Expand All @@ -77,7 +77,7 @@
:title="t('workspace', 'Convert group folders')"
@click="toggleShowSelectGroupfoldersModal" />
</div>
</div>
</div> -->
</template>
</AppNavigation>
<AppContent>
Expand All @@ -92,11 +92,11 @@
</div>
</AppContentDetails>
</AppContent>
<Modal
<!-- <Modal
v-if="showSelectGroupfoldersModal"
@close="toggleShowSelectGroupfoldersModal">
<SelectGroupfolders @close="toggleShowSelectGroupfoldersModal" />
</Modal>
</Modal> -->
</Content>
</template>

Expand Down Expand Up @@ -366,10 +366,10 @@ export default {

return groups
},
toggleShowSelectGroupfoldersModal() {
this.$store.dispatch('emptyGroupfolders')
this.showSelectGroupfoldersModal = !this.showSelectGroupfoldersModal
},
// toggleShowSelectGroupfoldersModal() {
// this.$store.dispatch('emptyGroupfolders')
// this.showSelectGroupfoldersModal = !this.showSelectGroupfoldersModal
// },
},
}
</script>
Expand Down

0 comments on commit cc68e46

Please sign in to comment.