Browse Source

Quick fixes after applying update

biotorrents 3 years ago
parent
commit
32dc6cdc87
3 changed files with 51 additions and 11 deletions
  1. 17
    2
      gazelle.sql
  2. 9
    9
      sections/torrents/browse.php
  3. 25
    0
      static/functions/browse.js

+ 17
- 2
gazelle.sql View File

@@ -585,6 +585,21 @@ CREATE TABLE `library_contest` (
585 585
 ) ENGINE=InnoDB CHARSET=utf8mb4;
586 586
 
587 587
 
588
+-- 2021-07-29
589
+CREATE TABLE `literature` (
590
+  `id` int NOT NULL,
591
+  `group_id` int NOT NULL,
592
+  `user_id` int NOT NULL,
593
+  `timestamp` datetime DEFAULT NULL,
594
+  `doi` varchar(255) NOT NULL,
595
+  `title` varchar(255) DEFAULT NULL,
596
+  `abstract` text DEFAULT NULL,
597
+  `venue` varchar(255) DEFAULT NULL,
598
+  `year` smallint DEFAULT NULL,
599
+  PRIMARY KEY (`id`,`group_id`,`doi`)
600
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
601
+
602
+
588 603
 -- 2020-03-09
589 604
 CREATE TABLE `locked_accounts` (
590 605
   `UserID` int unsigned NOT NULL,
@@ -1188,8 +1203,8 @@ CREATE TABLE `torrents_group` (
1188 1203
   `subject` varchar(255) DEFAULT NULL,
1189 1204
   `object` varchar(255) DEFAULT NULL,
1190 1205
   `year` smallint DEFAULT NULL,
1191
-  `workgroup` varchar(255) DEFAULT NULL,
1192
-  `location` varchar(255) DEFAULT NULL,
1206
+  `workgroup` varchar(100) DEFAULT NULL,
1207
+  `location` varchar(100) DEFAULT NULL,
1193 1208
   `identifier` varchar(50) DEFAULT NULL,
1194 1209
   `tag_list` varchar(500) DEFAULT NULL,
1195 1210
   `timestamp` datetime DEFAULT NULL,

+ 9
- 9
sections/torrents/browse.php View File

@@ -614,7 +614,7 @@ View::show_header('Browse Torrents', 'browse');
614 614
             Results
615 615
           </span>
616 616
 
617
-          <input type="submit" value="Search" class="button-primary"/>
617
+          <input type="submit" value="Search" class="button-primary" />
618 618
 
619 619
           <input type="hidden" name="action" id="ft_type"
620 620
             value="<?=($AdvancedSearch ? 'advanced' : 'basic')?>" />
@@ -726,14 +726,14 @@ die();
726 726
           continue;
727 727
       }
728 728
 
729
-      $CategoryID = $GroupInfo['CategoryID'];
730
-      $GroupYear = $GroupInfo['Year'];
729
+      $CategoryID = $GroupInfo['category_id'];
730
+      $GroupYear = $GroupInfo['year'];
731 731
       $Artists = $GroupInfo['Artists'];
732
-      $GroupCatalogueNumber = $GroupInfo['CatalogueNumber'];
733
-      $GroupStudio = $GroupInfo['Studio'];
734
-      $GroupName = empty($GroupInfo['Name']) ? (empty($GroupInfo['Title2']) ? $GroupInfo['NameJP'] : $GroupInfo['Title2']) : $GroupInfo['Name'];
735
-      $GroupTitle2 = $GroupInfo['Title2'];
736
-      $GroupNameJP = $GroupInfo['NameJP'];
732
+      $GroupCatalogueNumber = $GroupInfo['identifier'];
733
+      $GroupStudio = $GroupInfo['workgroup'];
734
+      $GroupName = empty($GroupInfo['title']) ? (empty($GroupInfo['subject']) ? $GroupInfo['object'] : $GroupInfo['subject']) : $GroupInfo['title'];
735
+      $GroupTitle2 = $GroupInfo['subject'];
736
+      $GroupNameJP = $GroupInfo['object'];
737 737
       
738 738
       if ($GroupResults) {
739 739
           $Torrents = $GroupInfo['Torrents'];
@@ -750,7 +750,7 @@ die();
750 750
           $Torrents = [$TorrentID => $GroupInfo['Torrents'][$TorrentID]];
751 751
       }
752 752
 
753
-      $TorrentTags = new Tags($GroupInfo['TagList']);
753
+      $TorrentTags = new Tags($GroupInfo['tag_list']);
754 754
 
755 755
       # Start making $DisplayName (first torrent result line)
756 756
       $DisplayName = '';

+ 25
- 0
static/functions/browse.js View File

@@ -1,3 +1,28 @@
1
+/**
2
+ * spoiler button stuff
3
+ * from bbcode.js, will move
4
+ */
5
+function BBSpoiler(link) {
6
+  if ($(link.nextSibling).has_class('hidden')) {
7
+    $(link.nextSibling).gshow();
8
+    $(link).html('Hide');
9
+    if ($(link).attr("value")) {
10
+      $(link).attr("value", "Hide" + $(link).attr("value").substring(4))
11
+    }
12
+  } else {
13
+    $(link.nextSibling).ghide();
14
+    $(link).html('Show');
15
+    if ($(link).attr("value")) {
16
+      $(link).attr("value", "Show" + $(link).attr("value").substring(4))
17
+    }
18
+  }
19
+}
20
+
21
+$(function () {
22
+  $(document).on('click', '.spoilerButton', e => BBSpoiler(e.target))
23
+})
24
+
25
+
1 26
 /**
2 27
  * show_peers
3 28
  */

Loading…
Cancel
Save