Ana Sayfa Keşfet Yardım
Üye Ol Giriş Yap
Omnimaga
/
bugs
2
0
Çatalla 0
Dosyalar Sorunlar 0 Değişiklik İstekleri 0 Wiki
Kaynağa Gözat

Work on issues display.

Nathaniel van Diepen 10 yıl önce
ebeveyn
4186bc1bfc
işleme
8f9c700dac
5 değiştirilmiş dosya ile 11 ekleme ve 5 silme
Görünümü Böl Farklılık Durumunu Göster
  1. 1 1
      api.php
  2. 7 1
      data/pages/issue.template
  3. 1 1
      data/pages/issues.template
  4. 1 1
      php/issue.php
  5. 1 1
      php/messages.php

+ 1 - 1
api.php
Dosyayı Görüntüle 

@@ -162,7 +162,7 @@
 
 											}
 
 										break;
 
 										case 'issues':
 
-											if($res = query("SELECT i.id,i.title,i.description,u.name as user FROM `issues` i JOIN `users` u ON u.id = i.u_id")){
 
+											if($res = query("SELECT i.id,i.title,i.description,u.name as user,s.name as status,p.name as priority,p.color FROM `issues` i JOIN `users` u ON u.id = i.u_id LEFT JOIN `statuses` s ON s.id = i.st_id LEFT JOIN `priorities` p ON p.id = i.pr_id")){
 
 												$context['issues'] = fetch_all($res,MYSQLI_ASSOC);
 
 												foreach($context['issues'] as $key => $issue){
 
 													$context['issues'][$key]['user'] = userObj($issue['user']);

+ 7 - 1
data/pages/issue.template
Dosyayı Görüntüle 

@@ -2,7 +2,13 @@
 
 	{{title}} <a style="font-size:small;color:gray;text-decoration:none;" href="#~{{user.name}}">{{user.name}}</a>
 
 </h2>
 
 <div style="font-size:large;">
 
-	{{description}}
 
+	Description: {{description}}
 
+</div>
 
+<div>
 
+	Priority: <span style="{{#if color}}color:{{color}};{{/if}}">{{priority}}</span>
 
+</div>
 
+<div>
 
+	Status: {{status}}
 
 </div>
 
 <span style="font-size:small;">
 
 	Comments

+ 1 - 1
data/pages/issues.template
Dosyayı Görüntüle 

@@ -10,7 +10,7 @@
 
 	</span>
 
 	{{#each issues}}
 
 		<h3>
 
-			{{title}} - <small>{{user.name}}</small>
 
+			{{#if priority}}[<span style="{{#if color}}color:{{color}};{{/if}}">{{priority}}</span>] {{/if}}{{title}}{{#if status}} ({{status}}){{/if}} - <small>{{user.name}}</small>
 
 			<a href="#!{{id}}" class="button">
 
 				Open
 
 			</a>

+ 1 - 1
php/issue.php
Dosyayı Görüntüle 

@@ -3,7 +3,7 @@
 
 	require_once(PATH_PHP.'database.php');
 
 	require_once(PATH_PHP.'messages.php');
 
 	function issueObj($id){
 
-		if($res = query("SELECT i.id,i.title,i.description,i.s_id,u.name as user FROM `issues` i JOIN `users` u ON u.id = i.u_id  WHERE i.id='%d'",array($id))){
 
+		if($res = query("SELECT i.id,i.title,i.description,i.s_id,u.name as user, p.name as priority, s.name as status,p.color FROM `issues` i JOIN `users` u ON u.id = i.u_id LEFT JOIN `priorities` p ON p.id = i.pr_id LEFT JOIN `statuses` s ON s.id = i.st_id WHERE i.id='%d'",array($id))){
 
 			if($res->num_rows == 1){
 
 				$issue = $res->fetch_assoc();
 
 				$issue['user'] = userObj($issue['user']);

+ 1 - 1
php/messages.php
Dosyayı Görüntüle 

@@ -32,7 +32,7 @@
 
 				}
 
 			break;
 
 			case 'issue':
 
-				if($res = query("SELECT m.id, u.name, m.message, UNIX_TIMESTAMP(m.timestamp) as timestamp FROM `messages` m JOIN `users` u ON u.id = m.from_id WHERE m.i_id='%d' ORDER BY m.timestamp DESC LIMIT %d,$d",array($id,$start,$amount))){
 
+				if($res = query("SELECT m.id, u.name, m.message, UNIX_TIMESTAMP(m.timestamp) as timestamp FROM `messages` m JOIN `users` u ON u.id = m.from_id WHERE m.i_id='%d' ORDER BY m.timestamp DESC LIMIT %d,%d",array($id,$start,$amount))){
 
 					$arr = array();
 
 					while($row = $res->fetch_assoc()){
 
 						array_push($arr,$row);