From 206d242edd712f2ee2bd984d2b89a939d52abb99 Mon Sep 17 00:00:00 2001
From: Alex Xin <Xin_boyan@126.com>
Date: Mon, 1 Jun 2020 03:06:02 +0800
Subject: [PATCH] bug fix
---
web/js/Award/awards_admin.js | 13 +++++++++++++
web/js/Project/update_old_project.js | 7 ++++---
web/webpage/admin-related/admin-background.html | 2 ++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/web/js/Award/awards_admin.js b/web/js/Award/awards_admin.js
index 1a03850..c9d222c 100644
--- a/web/js/Award/awards_admin.js
+++ b/web/js/Award/awards_admin.js
@@ -28,6 +28,19 @@ function getAwards(){
item = item+1;
loadAward(data[x], item);
}
+
+ var awardD = document.getElementsByName("edit_awardTime");
+ for(var i = 0 ; i < awardD.length; i ++){
+ awardD[i].datepicker({
+ autoclose: true,
+ clearBtn: true,
+ todayBtn: true,
+ todayHighlight: true,
+ format: 'yyyy-mm-dd'
+ });
+
+ }
+
}
},
error : function(msg) {
diff --git a/web/js/Project/update_old_project.js b/web/js/Project/update_old_project.js
index dc560f7..b9192d3 100644
--- a/web/js/Project/update_old_project.js
+++ b/web/js/Project/update_old_project.js
@@ -112,9 +112,9 @@ $(function() {
* classify the file type, store into array
*/
function classifyFiles(url){
- var urls = url.replaceAll("\n","");
- var index = urls.lastIndexOf(".");
- var ext = urls.substr(index+1);
+
+ var index = url.lastIndexOf(".");
+ var ext = url.substr(index+1);
// console.log(ext + " " + ext.length);
@@ -196,6 +196,7 @@ function submitForm() {
var userIdStr = strcookie.split(";")[0];
var userId = userIdStr.split("=")[1];
var pid = $.getUrlParam();
+ console.log(" " + otherfile)
projecttitle = $('#editTitle').val();
var projectcontent = $('textarea[name="content1"]').val();
diff --git a/web/webpage/admin-related/admin-background.html b/web/webpage/admin-related/admin-background.html
index 28a0e0f..b325982 100644
--- a/web/webpage/admin-related/admin-background.html
+++ b/web/webpage/admin-related/admin-background.html
@@ -15,11 +15,13 @@
<!-- Custom and plugin javascript -->
<link href="/css/custom.css" rel="stylesheet">
+ <link href="/datepicker/dist/css/bootstrap-datepicker3.min.css" rel="stylesheet">
<!--<script src="/js/custom.js"></script>-->
<!--<script src="/js/jquery.metisMenu.js"></script>-->
<script src="/js/jquery-confirm.js"></script>
<script src="/js/Experience/admin-background.js"></script>
<script src="/js/Award/awards_admin.js"></script>
+ <script src="/datepicker/dist/js/bootstrap-datepicker.js"></script>
</head>
<body>
--
GitLab