Merge pull request #350 from gopeak/dev

更新升级地址；修复高级查询数据重复的bug

Author: weichaoduo

app/view/twig/common/body/header-content.twig

@@ -265,7 +265,7 @@
                 <p>最新版本：<span id="new-version">正在检测...</span>&nbsp;&nbsp;<span id="check-message" ></span>&nbsp;&nbsp;<a href="" target="_blank" id="version-description" class="hidden">版本说明</a>&nbsp;&nbsp;<a href="javascript:;" id="btn-check-again" class="hidden">重新检测</a></p>
 
                 <div class="row control-group form-inline" id="upgrade-source-wrap">
-                    <div class="col-lg-12">更 新 源：<input type="text" name="upgrade_source" id="upgrade-source" value="http://www.masterlab.vip/" class="form-control form-control-inline" style="width: 200px;"><span style="margin-left: 10px;">若无特别说明，请勿修改此地址</span></div>
+                    <div class="col-lg-12">更 新 源：<input type="text" name="upgrade_source" id="upgrade-source" value="https://www.masterlab.vip/" class="form-control form-control-inline" style="width: 200px;"><span style="margin-left: 10px;">若无特别说明，请勿修改此地址</span></div>
                 </div>
                 <div id="upgrade-message" style="height: 300px; max-height: 300px; overflow: auto; border: solid 1px #cccccc; margin-top: 10px;"></div>
             </div>

app/view/twig/issue/list.twig

@@ -570,9 +570,7 @@
 
                 var timer = null;
 
-                window.$IssueAdvQuery = new IssueAdvQuery(_issueConfig);
-
-
+                //window.$IssueAdvQuery = new IssueAdvQuery(_issueConfig);
 
                 // 显示右侧浮动窗
                 function showFloatDetail(dataId, dataSummary) {

public/dev/js/issue/adv_query.js

@@ -61,51 +61,53 @@ var IssueAdvQuery = (function () {
                 type: value.type
             });
         }
-
-        for (var [key, value] of Object.entries(tempOptions.issue_module)) {
+        for(var i=0; i<tempOptions.issue_module.length; i++){
+            let row = tempOptions.issue_module[i];
             adv_options.modules.push({
-                name: value.name,
-                value: key
+                name: row.name,
+                value: row.id
             });
         }
-
-        for (var [key, value] of Object.entries(tempOptions.issue_resolve)) {
+        for(var i=0; i<tempOptions.issue_resolve.length; i++){
+            let row = tempOptions.issue_resolve[i];
             adv_options.resolves.push({
-                name: value.name,
-                value: key
+                name: row.name,
+                value: row.id
             });
         }
-
-        for (var [key, value] of Object.entries(tempOptions.issue_status)) {
+        for(var i=0; i<tempOptions.issue_status.length; i++){
+            let row = tempOptions.issue_status[i];
             adv_options.status.push({
-                name: value.name,
-                value: key
+                name: row.name,
+                value: row.id
             });
         }
-
-        for (var [key, value] of Object.entries(tempOptions.issue_types)) {
+        for(var i=0; i<tempOptions.issue_types.length; i++){
+            let row = tempOptions.issue_types[i];
             adv_options.issueTypes.push({
-                name: value.name,
-                value: key
+                name: row.name,
+                value: row.id
             });
         }
-
-        for (var [key, value] of Object.entries(tempOptions.priority)) {
+        for(var i=0;  i<tempOptions.priority.length; i++){
+            let row = tempOptions.priority[i];
             adv_options.priority.push({
-                name: value.name,
-                value: key
+                name: row.name,
+                value: row.id
             });
         }
+        console.log(adv_options.priority)
 
         adv_options.sprints = tempOptions.sprint;
 
-        for (var [key, value] of Object.entries(tempOptions.users)) {
+        for(var i=0;i<tempOptions.users.length; i++){
+            let row = tempOptions.users[i];
             adv_options.users.push({
-                name: value.username,
-                value: key,
-                avatar: value.avatar
+                name: row.name,
+                value: row.id
             });
         }
+        console.log(adv_options)
     };
 
     IssueAdvQuery.prototype.renderAdvQuery = function (details) {
@@ -219,12 +221,21 @@ var IssueAdvQuery = (function () {
         } else {
             temp.data = []
         }
-
-        temp.data.forEach(function (n) {
-            if (n.value === temp.value) {
-                n.selected = true;
+        console.log(temp.data);
+        if(_.isArray(temp.data)){
+            for(var i=0;i++;i<temp.data.length){
+                if(temp.value===temp.data[i]){
+                    temp.data[i].selected = true;
+                }
             }
-        });
+        }else{
+            temp.data.forEach(function (n) {
+                if (n.value === temp.value) {
+                    n.selected = true;
+                }
+            });
+        }
+
 
         var source = $('#adv_query_form_tpl').html();
         var template = Handlebars.compile(source);