Itmens/lib.itmens
Itmens/lib.itmens
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow merge tv show to/from season

Browse source
This commit is contained in:
Your Name 2023-05-23 08:08:07 -04:00 • committed by Henri Dickson
parent d22618498e
commit 2ee4a6c260
38 changed files with 45 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
catalog/management/commands/discover.py
View file

@ -46,7 +46,7 @@ class Command(BaseCommand):
]
gallery_list = []
for category in gallery_categories:
days = 14
days = 30
item_ids = []
while len(item_ids) < MAX_GALLERY_ITEMS / 2 and days < 150:
item_ids = self.get_popular_item_ids(category, days)

2
catalog/templates/catalog_edit.html
View file

@ -5,7 +5,7 @@
{% load oauth_token %}
{% load truncate %}
<!DOCTYPE html>
<html lang="en" class="content-page">
<html lang="zh" class="content-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
catalog/templates/discover.html
View file

@ -6,7 +6,7 @@
{% load truncate %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en" class="classic-page">
<html lang="zh" class="classic-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
catalog/templates/embed_base.html
View file

@ -9,7 +9,7 @@
{% load strip_scheme %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en">
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
catalog/templates/fetch_pending.html
View file

@ -9,7 +9,7 @@
{% load highlight %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en" class="classic-page">
<html lang="zh" class="classic-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
catalog/templates/item_base.html
View file

@ -11,7 +11,7 @@
{% load user_actions %}
{% load duration %}
<!DOCTYPE html>
<html lang="en" class="item-page">
<html lang="zh" class="item-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
catalog/templates/item_mark_list.html
View file

@ -9,7 +9,7 @@
{% load user_actions %}
{% load duration %}
<!DOCTYPE html>
<html lang="en" class="content-page">
<html lang="zh" class="content-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
catalog/templates/item_review_list.html
View file

@ -9,7 +9,7 @@
{% load user_actions %}
{% load duration %}
<!DOCTYPE html>
<html lang="en" class="content-page">
<html lang="zh" class="content-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

4
catalog/templates/search_results.html
View file

@ -9,11 +9,11 @@
{% load highlight %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en" class="classic-page">
<html lang="zh" class="classic-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{{ site_name }} - {% trans '搜索结果' %}</title>
<title>{{ site_name }} - {% trans '搜索' %} {{ request.GET.q }}</title>
{% include "common_libs.html" with jquery=0 v2=1 %}
</head>
<body>

6
catalog/views.py
View file

@ -258,7 +258,11 @@ def merge(request, item_path, item_uuid):
if not new_item or new_item.is_deleted or new_item.merged_to_item_id:
messages.add_message(request, messages.ERROR, _("不能合并到一个被删除或合并过的条目。"))
return redirect(item.url)
if new_item.class_name != item.class_name:
if item.class_name == "tvseason" and new_item.class_name == "tvshow":
pass
elif item.class_name == "tvshow" and new_item.class_name == "tvseason":
pass
elif new_item.class_name != item.class_name:
messages.add_message(
request,
messages.ERROR,

2
common/templates/400.html
View file

@ -7,7 +7,7 @@
{% load truncate %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en">
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
common/templates/403.html
View file

@ -7,7 +7,7 @@
{% load truncate %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en">
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
common/templates/404.html
View file

@ -7,7 +7,7 @@
{% load truncate %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en">
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
common/templates/500.html
View file

@ -7,7 +7,7 @@
{% load truncate %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en">
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
common/templates/503.html
View file

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
common/templates/common/error.html
View file

@ -7,7 +7,7 @@
{% load truncate %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en">
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
journal/templates/collection.html
View file

@ -10,7 +10,7 @@
{% load collection %}
{% load user_actions %}
<!DOCTYPE html>
<html lang="en" class="content-page">
<html lang="zh" class="content-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
journal/templates/collection_edit.html
View file

@ -5,7 +5,7 @@
{% load oauth_token %}
{% load truncate %}
<!DOCTYPE html>
<html lang="en" class="content-page">
<html lang="zh" class="content-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
journal/templates/piece_delete.html
View file

@ -5,7 +5,7 @@
{% load oauth_token %}
{% load truncate %}
<!DOCTYPE html>
<html lang="en">
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
journal/templates/profile.html
View file

@ -6,7 +6,7 @@
{% load truncate %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en" class="classic-page">
<html lang="zh" class="classic-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
journal/templates/review.html
View file

@ -8,7 +8,7 @@
{% load user_actions %}
{% load duration %}
<!DOCTYPE html>
<html lang="en" class="content-page">
<html lang="zh" class="content-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
journal/templates/review_edit.html
View file

@ -6,7 +6,7 @@
{% load truncate %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en" class="content-page">
<html lang="zh" class="content-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
journal/templates/user_collection_list.html
View file

@ -9,7 +9,7 @@
{% load user_actions %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en" class="classic-page">
<html lang="zh" class="classic-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
journal/templates/user_item_list_base.html
View file

@ -7,7 +7,7 @@
{% load truncate %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en" class="classic-page">
<html lang="zh" class="classic-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
journal/templates/user_tag_list.html
View file

@ -9,7 +9,7 @@
{% load highlight %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en" class="classic-page">
<html lang="zh" class="classic-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
management/templates/management/create_update.html
View file

@ -1,6 +1,6 @@
{% load static %}
<!DOCTYPE html>
<html lang="en">
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
management/templates/management/delete.html
View file

@ -1,6 +1,6 @@
{% load static %}
<!DOCTYPE html>
<html lang="en">
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
management/templates/management/detail.html
View file

@ -1,7 +1,7 @@
{% load static %}
{% load i18n %}
<!DOCTYPE html>
<html lang="en">
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
management/templates/management/list.html
View file

@ -1,7 +1,7 @@
{% load static %}
{% load i18n %}
<!DOCTYPE html>
<html lang="en">
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
social/templates/feed.html
View file

@ -7,7 +7,7 @@
{% load truncate %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en" class="feed-page">
<html lang="zh" class="feed-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
users/templates/users/data.html
View file

@ -6,7 +6,7 @@
{% load truncate %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en" class="classic-page">
<html lang="zh" class="classic-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
users/templates/users/home_anonymous.html
View file

@ -1,7 +1,7 @@
{% load static %}
{% load i18n %}
<!DOCTYPE html>
<html lang="en">
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta http-equiv="refresh" content="0;URL={{ login_url }}" />

2
users/templates/users/login.html
View file

@ -1,7 +1,7 @@
{% load i18n %}
{% load static %}
<!DOCTYPE html>
<html lang="en" class="login-page">
<html lang="zh" class="login-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
users/templates/users/manage_report.html
View file

@ -5,7 +5,7 @@
{% load oauth_token %}
{% load truncate %}
<!DOCTYPE html>
<html lang="en">
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
users/templates/users/preferences.html
View file

@ -6,7 +6,7 @@
{% load truncate %}
{% load thumb %}
<!DOCTYPE html>
<html lang="en" class="classic-page">
<html lang="zh" class="classic-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

6
users/templates/users/register.html
View file

@ -1,11 +1,11 @@
{% load i18n %}
{% load static %}
<!DOCTYPE html>
<html lang="en" class="login-page">
<html lang="zh" class="login-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{{ site_name }} - {% trans '注册' %}</title>
<title>{{ site_name }} - {% trans '注册完成' %}</title>
{% include "common_libs.html" with jquery=0 v2=1 %}
</head>
<body>
@ -18,7 +18,7 @@
{{ site_name }}还在不断完善中，丰富的内容需要大家共同创造。
试图添加垃圾数据（如添加信息混乱或缺失的书籍、以推广为主要目的的评论）将会受到严肃处理。
{{ site_name }}继承了联邦宇宙的用户关系，比如您在联邦宇宙屏蔽了某人，那您将不会在书影音的公共区域看到TA的痕迹。
本站为非盈利站点，cookie和其它数据保管使用原则请参阅<a href="/announcement/data-policy/">站内公告</a>。
本站为非盈利站点，cookie和其它数据保管使用原则请参阅<a href="{% url 'management:retrieve_slug' 'data-policy' %}">站内公告</a>。
</p>
<p>
此外，{{ site_name }}现处于测试阶段，疏漏在所难免，请妥善备份您的数据。

2
users/templates/users/relation_list.html
View file

@ -5,7 +5,7 @@
{% load oauth_token %}
{% load highlight %}
<!DOCTYPE html>
<html lang="en" class="classic-page">
<html lang="zh" class="classic-page">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

2
users/templates/users/report.html
View file

@ -5,7 +5,7 @@
{% load oauth_token %}
{% load truncate %}
<!DOCTYPE html>
<html lang="en">
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">