|
14 | 14 |
|
15 | 15 | relativeUrl=null; |
16 | 16 | var apiKey=null; |
17 | | - |
| 17 | + |
18 | 18 | /** |
19 | 19 | * Fonction qui permet de faire un requête Ajax en gérant l'authentification |
20 | 20 | */ |
|
40 | 40 | apiKey=jQuery('#apiKey').val(); |
41 | 41 |
|
42 | 42 | jQuery('.ticket-modele').hide(); |
43 | | - jQuery('#projet').empty(); |
| 43 | + jQuery('#project').empty(); |
44 | 44 | jQuery('#search-assigned').empty(); |
45 | 45 | getJson("/projects.json",function(data){ |
46 | | - jQuery('#projet').append(jQuery('<option>').html('----------').attr('value',0)); |
| 46 | + jQuery('#project').append(jQuery('<option>').html('----------').attr('value',0)); |
47 | 47 | for(i=0;i<data.projects.length;i++){ |
48 | | - jQuery('#projet').append(jQuery('<option>').html(data.projects[i].name).attr('value',data.projects[i].id)); |
| 48 | + jQuery('#project').append(jQuery('<option>').html(data.projects[i].name).attr('value',data.projects[i].id)); |
49 | 49 | } |
50 | 50 |
|
51 | 51 | var urlUsers="/users.json"; |
|
68 | 68 | }else{ |
69 | 69 | //Recherche sur une liste |
70 | 70 | url='/issues.json?limit=5000'; |
71 | | - if(jQuery('#projet').val()!='0'){ |
72 | | - url=url+'&project_id='+jQuery('#projet').val(); |
| 71 | + if(jQuery('#project').val()!='0'){ |
| 72 | + url=url+'&project_id='+jQuery('#project').val(); |
73 | 73 | } |
74 | 74 | if(jQuery('#search-assigned').val()!='0'){ |
75 | 75 | url=url+'&assigned_to_id='+jQuery('#search-assigned').val(); |
|
111 | 111 | * Fonction qui |
112 | 112 | */ |
113 | 113 | function getDivPostIssue(ticketCardModele,issue){ |
| 114 | +// console.log("getDivPostIssue(issue="+JSON.stringify(issue)+")"); |
114 | 115 | var ticketCard=ticketCardModele.clone().removeClass('ticket-modele').addClass('project'+issue.project.id).show(); |
115 | | - jQuery('.id',ticketCard).html(issue.id); |
| 116 | + |
| 117 | + jQuery('.id',ticketCard).html('<a href="'+relativeUrl+'/issues/'+issue.id+'">'+issue.id+'</a>'); |
| 118 | + jQuery('.project',ticketCard).html('<a href="'+relativeUrl+'/projects/'+issue.project.name+'/issues">'+issue.project.name+'</a>'); |
116 | 119 | jQuery('.subject',ticketCard).html(issue.subject); |
117 | | - //jQuery('.status',ticketCard).html(issue.status.name); |
118 | | - jQuery('.project',ticketCard).html(issue.project.name); |
| 120 | + jQuery('.status',ticketCard).html(issue.status.name); |
119 | 121 | jQuery('.author',ticketCard).html(issue.author.name); |
120 | 122 | if(issue.category){ |
121 | 123 | jQuery('.category',ticketCard).html(issue.category.name); |
|
144 | 146 | } |
145 | 147 |
|
146 | 148 | if(showLinkedTicket && issue.relations && issue.relations.length>0){ |
147 | | - var text=""; |
148 | | - for (var i=0;i<issue.relations.length-1;i++){ |
149 | | - text=text+issue.relations[i].id+"-"; |
| 149 | +console.log(JSON.stringify(issue.relations)); |
| 150 | + var x_issues=new Array(); |
| 151 | + for (var i=0;i<issue.relations.length;i++){ |
| 152 | + var il=issue.relations[i]; |
| 153 | + if(issue.id==il.issue_id) { x_issues[i]= il.issue_to_id; } |
| 154 | + else { x_issues[i]= il.issue_id; } |
| 155 | + } |
| 156 | + var text= JSON.stringify(x_issues); // hmm... that looks fine, actually |
| 157 | +/* |
| 158 | + // text=text+issue.relations[issue.relations.length-1].issue_id; |
| 159 | +var text; |
| 160 | + text=text+JSON.stringify(issue.relations[0]); |
| 161 | + for (var i=1;i<issue.relations.length;i++){ |
| 162 | + // text=text+"-"+issue.relations[i].issue_id; |
| 163 | + text=text+JSON.stringify(issue.relations[i]); |
150 | 164 | } |
151 | | - text=text+issue.relations[issue.relations.length].id; |
| 165 | +*/ |
152 | 166 | jQuery('.linked span',ticketCard).html(text); |
153 | 167 | jQuery('.linked',ticketCard).show(); |
154 | 168 | }else{ |
155 | 169 | jQuery('.linked',ticketCard).hide(); |
156 | 170 | } |
157 | | - |
158 | | - |
159 | | - |
| 171 | + |
160 | 172 | if(issue.custom_fields){ |
161 | 173 | for (var i=0;i<issue.custom_fields.length;i++){ |
162 | 174 | if(issue.custom_fields[i].id==12){ |
|
175 | 187 | } |
176 | 188 | } |
177 | 189 | } |
178 | | - |
| 190 | + |
179 | 191 | ticketCard.addClass("priority"+issue.priority.id); |
180 | 192 | return ticketCard; |
181 | 193 | } |
182 | 194 |
|
183 | 195 | }()); |
184 | 196 |
|
185 | | - |
186 | | - |
187 | | - |
|
0 commit comments