Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a768f319 authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'dev/nc-25' into 'main' 

update max version to 25

See merge request !50
parents 183f0386 4d71d88e

appinfo/info.xml

+3 −3
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@ 
    <description><![CDATA[in /e/OS cloud, nextcloud accounts are linked to mail accounts. This app ensures both are coordinated: it sets the e-mail address, quota and storage of the user upon creation.

    It also completes the account deletion by cleaning other parts of the /e/OS cloud setup to ensure no more data is retained when a user requests an account deletion.

    This app uses the UserDeletedEvent to invoke scripts in the docker-welcome container of /e/OS cloud setup]]></description>

    <version>2.4.2</version>

    <version>3.0.0</version>

    <licence>agpl</licence>

    <author mail="dev@e.email" homepage="https://gitlab.e.foundation/">Akhil Potukuchi</author>

    <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>

    <namespace>EcloudAccounts</namespace>

    <category>tools</category>

    <bugs>https://gitlab.e.foundation/e/management/issues</bugs>

    <dependencies>

        <nextcloud min-version="21" max-version="24"/>

        <nextcloud min-version="24" max-version="25"/>

    </dependencies>

	<settings>

		<personal>OCA\EcloudAccounts\Settings\Personal</personal>

package-lock.json

+2 −2
Original line number Diff line number Diff line 
{

	"name": "ecloud-accounts",

	"version": "2.4.0",

	"version": "3.0.0",

	"lockfileVersion": 2,

	"requires": true,

	"packages": {

		"": {

			"name": "ecloud-accounts",

			"version": "2.4.0",

			"version": "3.0.0",

			"dependencies": {

				"@nextcloud/axios": "^2.1.0",

				"@nextcloud/dialogs": "^3.2.0",

package.json

+1 −1
Original line number Diff line number Diff line 
{

	"name": "ecloud-accounts",

	"version": "2.4.1",

	"version": "3.0.0",

	"description": "App for ecloud account management.",

	"repository": {

		"type": "git",

src/delete-account-listeners.js

+8 −9
Original line number Diff line number Diff line 
/* global $ */

$(document).ready(function() {

document.addEventListener('DOMContentLoaded', function() {

	// Disable initially

	$('#drop_account_confirm').prop('disabled', true)

	$('#deleteaccount').prop('disabled', true)

	document.getElementById('drop_account_confirm').disabled = true

	document.getElementById('deleteaccount').disabled = true



	const elem = document.getElementById('body-settings')

	elem.addEventListener('disable-delete-account', function() {

		$('#deleteaccount').prop('disabled', true)

		$('#drop_account_confirm').prop('disabled', true)

	  document.getElementById('deleteaccount').disabled = true

	  document.getElementById('drop_account_confirm').disabled = true

	})



	elem.addEventListener('enable-delete-account', function() {

		$('#drop_account_confirm').prop('disabled', false)

		const enableDeleteAccount = $('#drop_account_confirm').is(':checked')

		$('#deleteaccount').prop('disabled', !enableDeleteAccount)

	  document.getElementById('drop_account_confirm').disabled = false

	  const enableDeleteAccount = document.getElementById('drop_account_confirm').checked

	  document.getElementById('deleteaccount').disabled = !enableDeleteAccount

	})

})