Skip to content

Commit

Permalink
Merge pull request #604 from arawa/revert/hide-convert-gf-button
Browse files Browse the repository at this point in the history
revert: Comment the convert feature
  • Loading branch information
zak39 authored Oct 28, 2022
2 parents 1acb9a4 + c384c6a commit af2d999
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 18 deletions.
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- bump babel-jest from 28.1.0 to 29.0.3 ( [#564](https://github.com/arawa/workspace/pull/564) )
- bump @nextcloud/axios from 1.10.0 to 2.0.0 ( [#565](https://github.com/arawa/workspace/pull/565) )

## [1.2.3] - 2022-10-28

### Changed

- Comment the convert feature ( [#604](https://github.com/arawa/workspace/pull/604) )

## [1.2.2] - 2022-08-19

### Chore
Expand Down Expand Up @@ -63,9 +69,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Define users' roles (GeneralManager and WorkspacesManager)


[Unreleased]: https://github.com/arawa/workspace/compare/v1.2.2...main
[Unreleased]: https://github.com/arawa/workspace/compare/v1.2.3...main
[1.2.3]: https://github.com/arawa/workspace/compare/v1.2.2...1.2.3
[1.2.2]: https://github.com/arawa/workspace/compare/v1.2.1...1.2.2
[1.2.1]: https://github.com/arawa/workspace/compare/v1.2.0...v1.2.1
[1.2.0]: https://github.com/arawa/workspace/compare/v1.1.0...v1.2.0
[1.1.0]: https://github.com/arawa/workspace/compare/v1.0.1...v1.1.0
[1.0.0]: https://github.com/arawa/workspace/releases/tag/v1.0.0
[1.0.0]: https://github.com/arawa/workspace/releases/tag/v1.0.0
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<name>Workspace</name>

<version>1.2.2</version>
<version>1.2.3</version>

<licence>agpl</licence>

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' => 'workspace#convertGroupfolderToSpace',
'url' => '/spaces/convert',
'verb' => 'POST'
],
/**
* @todo decomment these lines when we find the
* true feature.
*/
// [
// 'name' => 'workspace#convertGroupfolderToSpace',
// 'url' => '/spaces/convert',
// 'verb' => 'POST'
// ],
[
'name' => 'space#find',
'url' => '/workspaces/{id}',
Expand Down
14 changes: 4 additions & 10 deletions src/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@
</div>
</AppNavigationItem>
</template>
<ActionButton v-if="$root.$data.isUserGeneralAdmin === 'true'"
<!-- <ActionButton v-if="$root.$data.isUserGeneralAdmin === 'true'"
icon="icon-settings-dark"
class="btn-convert"
:close-after-click="true"
:title="t('workspace', 'Import / Convert')"
@click="toggleShowSelectGroupfoldersModal" />
@click="toggleShowSelectGroupfoldersModal" /> -->
</AppNavigation>
<AppContent>
<AppContentDetails>
Expand All @@ -82,11 +82,11 @@
</div>
</AppContentDetails>
</AppContent>
<Modal
<!-- <Modal
v-if="showSelectGroupfoldersModal"
@close="toggleShowSelectGroupfoldersModal">
<SelectGroupfolders @close="toggleShowSelectGroupfoldersModal" />
</Modal>
</Modal> -->
</Content>
</template>

Expand All @@ -98,13 +98,10 @@ import AppNavigation from '@nextcloud/vue/dist/Components/AppNavigation'
import AppNavigationIconBullet from '@nextcloud/vue/dist/Components/AppNavigationIconBullet'
import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
import AppNavigationNewItem from '@nextcloud/vue/dist/Components/AppNavigationNewItem'
import Modal from '@nextcloud/vue/dist/Components/Modal'
import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
import Content from '@nextcloud/vue/dist/Components/Content'
import { generateUrl } from '@nextcloud/router'
import { getLocale } from '@nextcloud/l10n'
import { get, formatGroups, create, formatUsers } from './services/groupfoldersService'
import SelectGroupfolders from './SelectGroupfolders'
import { deleteBlankSpacename } from './services/spaceService'
export default {
Expand All @@ -115,11 +112,8 @@ export default {
AppNavigation,
AppNavigationIconBullet,
AppNavigationItem,
ActionButton,
AppNavigationNewItem,
Content,
Modal,
SelectGroupfolders,
},
data() {
return {
Expand Down

0 comments on commit af2d999

Please sign in to comment.