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

Merge branch '12.0'

Browse Source
This commit is contained in:
r350178982
2025-10-14 10:20:19 +08:00
parent 9ac1ddad03 83fbfdaeee
commit f59a8e6683
10 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/components/file-view/file-toolbar.js
View File

@@ -259,6 +259,16 @@ class FileToolbar extends React.Component {
<a href={`${siteRoot}library/${repoID}/${Utils.encodePath(repoName + parentDir)}`} className="dropdown-item">
{gettext('Open parent folder')}
</a>
{isTxt &&
<DropdownItem id='txt-line-wrap-menu' className='dropdown-item'>
<Switch
checked={this.props.lineWrapping}
placeholder={gettext('Line wrapping')}
className="txt-line-wrap-menu w-100"
onChange={() => this.props.updateLineWrapping(!this.props.lineWrapping)}
/>
</DropdownItem>
}
</DropdownMenu>
</Dropdown>
</div>

1
frontend/src/models/activity.js
View File

@@ -14,6 +14,7 @@ class Acticity {
this.op_type = json.op_type;
this.createdFilesCount = 0;
this.createdFilesList = [];
this.login_id = json.login_id;
if (json.op_type === 'clean-up-trash') {
this.days = json.days;
} else if (json.op_type === 'rename' && json.obj_type === 'repo') {

6
frontend/src/pages/dashboard/files-activities.js
View File

@@ -81,7 +81,8 @@ class FilesActivities extends Component {
name: item.author_name,
contact_email: item.author_contact_email,
avatar_url: item.avatar_url,
isSelected: false
isSelected: false,
login_id: item.login_id
});
}
});
@@ -181,7 +182,8 @@ class FilesActivities extends Component {
name: item.author_name,
contact_email: item.author_contact_email,
avatar_url: item.avatar_url,
isSelected: false
isSelected: false,
login_id: item.login_id,
});
}
});

2
frontend/src/pages/dashboard/user-selector.js
View File

@@ -69,7 +69,7 @@ class UserSelector extends Component {
const { isPopoverOpen, query } = this.state;
const { currentSelectedUsers, availableUsers } = this.props;
const selectedUsers = availableUsers.filter(item => item.isSelected);
const filteredAvailableUsers = query.trim() ? availableUsers.filter(item => item.contact_email.indexOf(query.trim()) != -1 || item.name.indexOf(query.trim()) != -1) : availableUsers;
const filteredAvailableUsers = query.trim() ? availableUsers.filter(item => item.contact_email.indexOf(query.trim()) != -1 || item.name.indexOf(query.trim()) != -1 || item.login_id.indexOf(query.trim()) != -1) : availableUsers;
return (
<div className="mt-4 position-relative">
<span

3
seahub/api2/endpoints/activities.py
View File

@@ -9,7 +9,7 @@ from rest_framework.response import Response
from rest_framework.permissions import IsAuthenticated
from rest_framework.authentication import SessionAuthentication
from seahub.base.templatetags.seahub_tags import email2contact_email
from seahub.base.templatetags.seahub_tags import email2contact_email, email2login_id
from seahub.utils import EVENTS_ENABLED, get_user_activities, is_pro_version, IS_DB_SQLITE3
from seahub.utils.timeutils import utc_datetime_to_isoformat_timestr
from seahub.api2.utils import api_error
@@ -65,6 +65,7 @@ class ActivitiesView(APIView):
d['author_email'] = e.op_user
d['author_name'] = email2nickname(e.op_user)
d['author_contact_email'] = email2contact_email(e.op_user)
d['login_id'] = email2login_id(e.op_user)
url, is_default, date_uploaded = api_avatar_url(e.op_user)
d['avatar_url'] = url

14
seahub/api2/endpoints/group_members.py
View File

@@ -467,7 +467,7 @@ class GroupMembersImport(APIView):
emails_list = []
for record in records:
if record[0]:
email = record[0].strip().lower()
email = str(record[0]).strip().lower()
emails_list.append(email)
result = {}
@@ -486,12 +486,14 @@ class GroupMembersImport(APIView):
user_not_found = False
try:
User.objects.get(email=email)
User.objects.get(email=email_from_excel)
except User.DoesNotExist:
user_not_found = True
if user_not_found:
email = Profile.objects.get_username_by_contact_email(email)
email = Profile.objects.get_username_by_contact_email(email_from_excel)
if not email:
email = Profile.objects.get_username_by_login_id(email_from_excel)
try:
User.objects.get(email=email)
user_not_found = False
@@ -571,11 +573,15 @@ class GroupMembersImportExample(APIView):
def get(self, request):
data_list = []
head = [_('Email')]
head = [_('Email or LoginID')]
for i in range(5):
username = "test" + str(i) + "@example.com"
data_list.append([username])
for i in range(5):
login_id = "ID" + str(i)
data_list.append([login_id])
wb = write_xls('sample', head, data_list)
if not wb:
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, _('Failed to export Excel'))

3
seahub/api2/endpoints/internal_api.py
View File

@@ -18,6 +18,7 @@ from seahub.views.file import send_file_access_msg, FILE_TYPE_FOR_NEW_FILE_LINK
from seahub.utils import normalize_file_path, get_file_type_and_ext
from seahub.views import check_folder_permission
logger = logging.getLogger(__name__)
OP_DOWNLOAD = 'download'
@@ -29,7 +30,6 @@ AVAILABLE_OPS = [
class InternalUserListView(APIView):
throttle_classes = (UserRateThrottle, )
def post(self, request):
@@ -189,7 +189,6 @@ class InternalCheckFileOperationAccess(APIView):
if not (ignore_download_perms or op_perms.can_download):
error_msg = 'Permission denied.'
return api_error(status.HTTP_403_FORBIDDEN, error_msg)
if op == OP_UPLOAD and not op_perms.can_upload:
error_msg = 'Permission denied.'
return api_error(status.HTTP_403_FORBIDDEN, error_msg)

2
seahub/auth/forms.py
View File

@@ -68,6 +68,8 @@ class AuthenticationForm(forms.Form):
try:
user = User.objects.get(email=converted_login_str)
if not user.is_active:
is_first_login = not UserOptions.objects.is_user_logged_in(user.username)
if not is_first_login or not settings.ACTIVATE_AFTER_FIRST_LOGIN:
self.errors['inactive'] = _("This account is inactive.")
raise forms.ValidationError(_("This account is inactive."))
except User.DoesNotExist:

19
seahub/base/templatetags/seahub_tags.py
View File

@@ -19,7 +19,7 @@ from seahub.base.accounts import User
from seahub.profile.models import Profile
from seahub.profile.settings import NICKNAME_CACHE_TIMEOUT, NICKNAME_CACHE_PREFIX, \
EMAIL_ID_CACHE_TIMEOUT, EMAIL_ID_CACHE_PREFIX, CONTACT_CACHE_TIMEOUT, \
CONTACT_CACHE_PREFIX
CONTACT_CACHE_PREFIX, LOGIN_ID_CACHE_PREFIX, LOGIN_ID_CACHE_TIMEOUT
from seahub.cconvert import CConvert
from seahub.settings import TIME_ZONE
from seahub.shortcuts import get_first_object_or_none
@@ -407,6 +407,23 @@ def email2contact_email(value):
cache.set(key, contact_email, CONTACT_CACHE_TIMEOUT)
return contact_email
@register.filter(name='email2login_id')
def email2login_id(value):
if not value:
return ''
key = normalize_cache_key(value, LOGIN_ID_CACHE_PREFIX)
login_id = cache.get(key)
if login_id and login_id.strip():
return login_id
profile = Profile.objects.get_profile_by_user(value)
login_id = profile and profile.login_id or ''
cache.set(key, login_id, LOGIN_ID_CACHE_TIMEOUT)
return login_id
@register.filter(name='email2id')
def email2id(value):
"""

3
seahub/profile/settings.py
View File

@@ -9,3 +9,6 @@ EMAIL_ID_CACHE_PREFIX = getattr(settings, 'EMAIL_ID_CACHE_PREFIX', 'EMAIL_ID_')
CONTACT_CACHE_TIMEOUT = getattr(settings, 'CONTACT_CACHE_TIMEOUT', 24 * 60 * 60)
CONTACT_CACHE_PREFIX = getattr(settings, 'CONTACT_CACHE_PREFIX', 'CONTACT_')
LOGIN_ID_CACHE_TIMEOUT = getattr(settings, 'LOGIN_ID_CACHE_TIMEOUT', 24 * 60 * 60)
LOGIN_ID_CACHE_PREFIX = getattr(settings, 'LOGIN_ID_CACHE_PREFIX', 'LOGIN_ID_')