haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-08 10:22:46 +00:00
Code Issues Releases Wiki Activity

only pro version has Institution feature (#6133)

Browse Source
This commit is contained in:
lian
2024-05-30 11:59:59 +08:00
committed by GitHub
parent 1997bc344e
commit b24f9dab93
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/common/account.js
View File

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import { Utils } from '../../utils/utils'; import { Utils } from '../../utils/utils';
import { seafileAPI } from '../../utils/seafile-api'; import { seafileAPI } from '../../utils/seafile-api';
import { siteRoot, gettext, appAvatarURL, enableSSOToThirdpartWebsite } from '../../utils/constants'; import { siteRoot, isPro, gettext, appAvatarURL, enableSSOToThirdpartWebsite } from '../../utils/constants';
import toaster from '../toast'; import toaster from '../toast';
const { const {
@@ -131,7 +131,7 @@ class Account extends Component {
url: `${siteRoot}org/info/`, url: `${siteRoot}org/info/`,
text: gettext('Organization Admin') text: gettext('Organization Admin')
}; };
} else if (isInstAdmin) { } else if (isPro && isInstAdmin) {
data = { data = {
url: `${siteRoot}inst/useradmin/`, url: `${siteRoot}inst/useradmin/`,
text: gettext('Institution Admin') text: gettext('Institution Admin')

2
frontend/src/pages/sys-admin/side-panel.js
View File

@@ -139,7 +139,7 @@ class SidePanel extends React.Component {
</Link> </Link>
</li> </li>
} }
{multiInstitution && otherPermission && {isPro && multiInstitution && otherPermission &&
<li className="nav-item"> <li className="nav-item">
<Link <Link
className={`nav-link ellipsis ${this.getActiveClass('institutions')}`} className={`nav-link ellipsis ${this.getActiveClass('institutions')}`}

7
seahub/api2/endpoints/admin/institution_users.py
View File

@@ -7,10 +7,9 @@ from rest_framework.response import Response
from rest_framework.views import APIView from rest_framework.views import APIView
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
from seaserv import seafile_api, ccnet_api
from seahub.api2.authentication import TokenAuthentication from seahub.api2.authentication import TokenAuthentication
from seahub.api2.throttling import UserRateThrottle from seahub.api2.throttling import UserRateThrottle
from seahub.api2.permissions import IsProVersion
from seahub.api2.utils import api_error from seahub.api2.utils import api_error
from seahub.base.templatetags.seahub_tags import email2nickname, email2contact_email from seahub.base.templatetags.seahub_tags import email2nickname, email2contact_email
@@ -54,7 +53,7 @@ def get_institution_user_info(user_obj, institution, is_check_admin=True):
class AdminInstitutionUsers(APIView): class AdminInstitutionUsers(APIView):
authentication_classes = (TokenAuthentication, SessionAuthentication) authentication_classes = (TokenAuthentication, SessionAuthentication)
permission_classes = (IsAdminUser, ) permission_classes = (IsAdminUser, IsProVersion)
throttle_classes = (UserRateThrottle, ) throttle_classes = (UserRateThrottle, )
def get(self, request, institution_id): def get(self, request, institution_id):
@@ -185,7 +184,7 @@ class AdminInstitutionUsers(APIView):
class AdminInstitutionUser(APIView): class AdminInstitutionUser(APIView):
authentication_classes = (TokenAuthentication, SessionAuthentication) authentication_classes = (TokenAuthentication, SessionAuthentication)
permission_classes = (IsAdminUser, ) permission_classes = (IsAdminUser, IsProVersion)
throttle_classes = (UserRateThrottle, ) throttle_classes = (UserRateThrottle, )
def put(self, request, institution_id, email): def put(self, request, institution_id, email):

9
seahub/api2/endpoints/admin/institutions.py
View File

@@ -6,16 +6,15 @@ from rest_framework.permissions import IsAdminUser
from rest_framework.response import Response from rest_framework.response import Response
from rest_framework.views import APIView from rest_framework.views import APIView
from seaserv import seafile_api, ccnet_api
from seahub.api2.authentication import TokenAuthentication from seahub.api2.authentication import TokenAuthentication
from seahub.api2.throttling import UserRateThrottle from seahub.api2.throttling import UserRateThrottle
from seahub.api2.permissions import IsProVersion
from seahub.api2.utils import api_error from seahub.api2.utils import api_error
from seahub.profile.models import Profile from seahub.profile.models import Profile
from seahub.utils.file_size import get_file_size_unit from seahub.utils.file_size import get_file_size_unit
from seahub.utils.timeutils import datetime_to_isoformat_timestr from seahub.utils.timeutils import datetime_to_isoformat_timestr
from seahub.institutions.models import Institution, InstitutionQuota, InstitutionAdmin from seahub.institutions.models import Institution, InstitutionQuota
from seahub.institutions.utils import get_institution_space_usage from seahub.institutions.utils import get_institution_space_usage
from seahub.signals import institution_deleted from seahub.signals import institution_deleted
@@ -25,7 +24,7 @@ logger = logging.getLogger(__name__)
class AdminInstitutions(APIView): class AdminInstitutions(APIView):
authentication_classes = (TokenAuthentication, SessionAuthentication) authentication_classes = (TokenAuthentication, SessionAuthentication)
permission_classes = (IsAdminUser, ) permission_classes = (IsAdminUser, IsProVersion)
throttle_classes = (UserRateThrottle, ) throttle_classes = (UserRateThrottle, )
def get(self, request): def get(self, request):
@@ -91,7 +90,7 @@ class AdminInstitutions(APIView):
class AdminInstitution(APIView): class AdminInstitution(APIView):
authentication_classes = (TokenAuthentication, SessionAuthentication) authentication_classes = (TokenAuthentication, SessionAuthentication)
permission_classes = (IsAdminUser, ) permission_classes = (IsAdminUser, IsProVersion)
throttle_classes = (UserRateThrottle, ) throttle_classes = (UserRateThrottle, )
def get(self, request, institution_id): def get(self, request, institution_id):