修改publication

Hunter_ht/hunter/static/hunter/style.css

@@ -515,7 +515,7 @@ ul:after{
 .right{
     float:right !important;
     height: 20px !important;
-    margin: 0 5px 10px;
+    margin: 0 5px;
     z-index: -999;
     font-size:14px;
 }

Hunter_ht/hunter/templates/hunter/user.html

@@ -76,8 +76,7 @@
                 <ul id="pubid{{ publication.pubID }}">
                     <li class="big_text li_long"><a href="{% static 'hunter/publications/' %}{{ publication.link }}" target="_blank">{{ publication.title }}</a></li>
                     <li class="right"><button class="dele_img" onclick="delePub({{ publication.pubID }})"></button></li>
-{#                    <li class="right"><button onclick="editPublication({{ publication.pubID }})"><svg t="1587711451871" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2741" width="20" height="20"><path d="M863.079412 351.09129a29.2569 29.2569 0 0 1 58.5138 0v555.881108a117.027602 117.027602 0 0 1-117.027601 117.027602H219.427602a117.027602 117.027602 0 0 1-117.027602-117.027602V146.292987a117.027602 117.027602 0 0 1 117.027602-117.027602h380.339706a29.2569 29.2569 0 0 1 0 58.513801H219.427602a58.513801 58.513801 0 0 0-58.513801 58.513801v760.679411a58.513801 58.513801 0 0 0 58.513801 58.513801h585.138009a58.513801 58.513801 0 0 0 58.513801-58.513801V351.09129zM855.414104 10.306913a29.2569 29.2569 0 1 1 44.587516 37.916943l-248.683654 292.569005a29.2569 29.2569 0 1 1-44.587516-37.916943l248.683654-292.569005zM307.198303 526.632692h263.312104a29.2569 29.2569 0 0 1 0 58.513801H307.198303a29.2569 29.2569 0 0 1 0-58.513801z m0 175.541403h409.596606a29.2569 29.2569 0 0 1 0 58.513801H307.198303a29.2569 29.2569 0 0 1 0-58.513801z" p-id="2742" fill="#6e829e"></path></svg>#}
-{#                </button></li>#}
+                    <li class="right"><button class="edit_img" onclick="editPublication({{ publication.pubID }})"></button></li>
                     <li class="right">
                         <button class="change_open" onclick="change_open(this,{{ publication.pubID }})">
                         {% if publication.isOpen == '1' %}
@@ -162,7 +161,6 @@
                     {% else %}
                         <a href="{% url 'hunter:article' art.articleID %}" target="_blank">{{ art.title }}</a>
                     {% endif %}
-
                 </li>
                 <li>{{ art.author }}</li>
                 <li class="right"><button onclick="deleArt({{ art.articleID }})"><svg t="1587713476030" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4730" width="20" height="20"><path d="M864 128H544v-16a32 32 0 0 0-64 0v16H160a32 32 0 0 0 0 64h704a32 32 0 0 0 0-64z m-64 128a32 32 0 0 0-32 32v592H256V288a32 32 0 0 0-64 0v624a32 32 0 0 0 32 32h576a32 32 0 0 0 32-32V288a32 32 0 0 0-32-32zM416 784V304a32 32 0 0 0-64 0v480a32 32 0 0 0 64 0z m128 0V304a32 32 0 0 0-64 0v480a32 32 0 0 0 64 0z m128 0V304a32 32 0 0 0-64 0v480a32 32 0 0 0 64 0z" fill="#b34340" p-id="4731"></path></svg>
@@ -248,10 +246,7 @@
         $('#edit_title').empty();
         $('#edit_title').append('添加出版');
     }
-    function editPublication(pubid){
-        console.log(pubid);
-        create_html();
-    }
+
     function submit_publication(){
         let title = $('input[name="title"]').val();
         let authors = $('input[name="authors"]').val();
@@ -273,7 +268,7 @@
         formatData.append("isPublish", isPublish);
 
         $.ajax({
-            url:"{% url 'hunter:add_publication' %} ",
+            url:"{% url 'hunter:add_publication' %}" ,
             type: 'post',
             data:formatData,
             contentType: false,
@@ -281,23 +276,77 @@
             success: function (response){
                 if(response['message']){
                     hide_edit();
-                    let isFind=0;
-                    let year = date.substr(0,4);
-                    let date_month = date.substr(5,10);
-                    $('#publish blockquote').each(function(){
-
-                        if(this.children[0].innerText===year){
-                            isFind=1;
-                            var $h1=' <ul><li class="big_text li_long"><a href="/static/hunter/publications/'+myfile.name+'" target="_blank">'+title+'</a></li><li class="right"><button class="dele_img" onclick="delePub('+response['pubID']+')"></button></li><li class="middle_text right">'+date_month+'</li><li class="right">'+journalname+'</li><li class="right">'+type+'</li><li class="small_text">'+authors+'</li></ul>';
-                            $(this).after($h1);
                     window.location.reload();
+                }else{
+                    $('#error_log').append(response['error']);
+                }
+            },
+            error: function (xhr){
             }
         });
-                    if(!isFind){
-                        var $h2='<blockquote><p>'+year+'</p></blockquote><ul><li class="big_text li_long"><a href="/static/hunter/publications/'+myfile.name+'" target="_blank">'+title+'</a></li> <li class="right"><button class="dele_img" onclick="delePub('+response['pubID']+')"></button></li><li class="middle_text right">'+date_month+'</li><li class="right">'+journalname+'</li><li class="right">'+type+'</li><li class="small_text">'+authors+'</li></ul>';
-                        $('#publish .wrap')[0].prepend($h2);
-                        window.location.reload();
     }
+    function editPublication(pubID){
+        show_edit();
+        let html =
+            '            <button id="cancel_btn" onclick="hide_edit()">\n' +
+            '                取消\n' +
+            '            </button>\n' +
+            '            <button id="submit_btn" onclick="submit_edit_publication(\'/edit/publication/\','+pubID+')">\n' +
+            '                提交\n' +
+            '            </button>\n';
+        $('#btn_edit').empty();
+        $('#btn_edit').append(html);
+        create_publication_html();
+        let node=document.getElementById('pubid'+pubID);
+        $('input[name="title"]').val(node.children[0].children[0].innerText);
+        $('input[name="authors"]').val(node.children[7].innerText);
+        $('input[name="date"]').val(node.parentElement.children[0].children[0].innerText+'-'+node.children[4].innerText);
+        $('input[name="journalname"]').val(node.children[5].innerText);
+        $('select[name="type"]').val(node.children[6].innerText);
+        if(node.children[3].innerText==='发布'){
+            $('#isPublish').val('0');
+        }else{
+            $('#isPublish').val('1');
+        }
+    }
+    function submit_edit_publication(url_edit,pubID){
+        let title = $('input[name="title"]').val();
+        let authors = $('input[name="authors"]').val();
+        let journalname = $('input[name="journalname"]').val();
+        let date = $('#date_input').val();
+        let type = $('select[name="type"] option:selected').val();
+        let storage = window.localStorage;
+        let username = storage.username;
+        let isPublish = $('#isPublish option:selected').val();
+        let formatData = new FormData();
+        let files = $('input[name="myfile"]')[0].files;
+        if(files.length>0){
+            let myfile =files[0];
+            formatData.append("myfile",myfile);
+            formatData.append("isHaveFile", "1");
+        }else{
+            formatData.append("isHaveFile", "0");
+        }
+        formatData.append("title", title);
+        formatData.append("pubID", pubID);
+        formatData.append("authors", authors);
+        formatData.append("journalname", journalname);
+        formatData.append("date", date);
+        formatData.append("type", type);
+        formatData.append("username", username);
+        formatData.append("isPublish", isPublish);
+
+
+        $.ajax({
+            url:url_edit ,
+            type: 'post',
+            data:formatData,
+            contentType: false,
+            processData: false,
+            success: function (response){
+                if(response['message']){
+                    hide_edit();
+                    window.location.reload();
                 }else{
                     $('#error_log').append(response['error']);
                 }

Hunter_ht/hunter/urls.py

@@ -25,6 +25,7 @@ urlpatterns = [
     path('delete/cve/', views.delete_cve, name='delete_cve'),
     path('delete/article/', views.delete_article, name='delete_article'),
     path('add/publication/', views.add_publication, name='add_publication'),
+    path('edit/publication/', views.edit_publication, name='edit_publication'),
     path('add/cve/', views.add_cve, name='add_cve'),
     path('edit/cve/', views.edit_cve, name='edit_cve'),
     path('add/article/', views.add_article, name='add_article'),

Hunter_ht/hunter/views.py

@@ -424,6 +424,7 @@ def change_pub_status(request):
     except ObjectDoesNotExist as e:
         return JsonResponse({'message':0,'error':e})
 
+
 @csrf_exempt
 def add_publication(request):
     title = request.POST['title']
@@ -506,6 +507,95 @@ def add_publication(request):
 
 
 @csrf_exempt
+def edit_publication(request):
+    pubID = request.POST['pubID']
+    title = request.POST['title']
+    authors = request.POST['authors']
+    uploadby = request.POST['username']
+    publishType = request.POST['type']
+    isHaveFile = request.POST['isHaveFile']
+    s='，'
+    authors = authors.replace(s, ',')
+    journalname = request.POST.get('journalname')
+    date = request.POST.get('date')
+    index = request.POST.get('index')
+    isPublish=request.POST['isPublish']
+    origin_author = Publications.objects.get(pubID=pubID).authors
+    if Publications.objects.filter(pubID=pubID).count() <=0:
+        return JsonResponse({'message': 0, "error": "该出版不存在"})
+    if isHaveFile == '1':
+        myfile = request.FILES['myfile']
+        BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        destination = os.path.join(BASE_DIR,'hunter', 'static', 'hunter/publications', myfile.name)
+        if os.path.exists(destination):
+            os.remove(destination)
+        with open(destination,'wb+') as dest:
+            for chunk in myfile.chunks():
+                dest.write(chunk)
+            dest.close()
+            link = myfile.name
+            try:
+                Publications.objects.filter(pubID=pubID).update(title=title,link=link, authors=authors,
+                                                                journalname=journalname,uploadByUser=uploadby,
+                                                                date=date, publishType=publishType, isOpen=isPublish)
+                response = JsonResponse({"message": 1, 'pubID': pubID})
+            except ProgrammingError as e:
+                return JsonResponse({"message": 0})
+    else:
+        try:
+            Publications.objects.filter(pubID=pubID).update(title=title, authors=authors, journalname=journalname,
+                                                            uploadByUser=uploadby, date=date, publishType=publishType,
+                                                            isOpen=isPublish)
+            response = JsonResponse({"message": 1, 'pubID': pubID})
+        except ProgrammingError as e:
+            return JsonResponse({"message": 0})
+    authorArr = authors.split(',')
+    originArr = origin_author.split(',')
+    if authorArr != originArr:
+        print(authorArr)
+        print(originArr)
+        PubToUser.objects.filter(pubID=pubID).delete()
+        for author in authorArr:
+            users_list = User.objects.all().values('name')
+            user_list = []
+            for user in users_list:
+                user_list.append(user['name'])
+            author = str(author).lower().strip()
+            if ' ' in author:
+                author_version1 = author.replace(' ', '')
+                author_version2 = author.split(' ')[1] + str(author).lower().strip().split(' ')[0]
+            else:
+                author_version1 = author.replace(' ', '')
+                author_version2 = author
+            print(user_list)
+            print(author_version1)
+            print(author_version2)
+            if author_version1 in user_list:
+                userID = User.objects.filter(name=author_version1).values('userID')[0]['userID']
+                try:
+                    PubToUser.objects.create(pubID=pubID, username=author, userID=userID)
+                    response = JsonResponse({"message": 1, 'pubID': pubID})
+                except ProgrammingError as e:
+                    return JsonResponse({"message": 0})
+            else:
+                if author_version2 in user_list:
+                    userID = User.objects.filter(name=author_version2).values('userID')[0]['userID']
+                    try:
+                        PubToUser.objects.create(pubID=pubID, username=author, userID=userID)
+                        response = JsonResponse({"message": 1, 'pubID': pubID})
+                    except ProgrammingError as e:
+                        return JsonResponse({"message": 0})
+                else:
+                    try:
+                        PubToUser.objects.create(pubID=pubID, username=author)
+                        response = JsonResponse({"message": 1, 'pubID': pubID})
+                    except ProgrammingError as e:
+                        return JsonResponse({"message": 0})
+    return response
+
+
+
+@csrf_exempt
 def add_cve(request):
     owner = request.POST['owner']
     bugType = request.POST['bugType']