From: x2000habouzit <x2000habouzit>
Date: Mon, 23 Feb 2004 18:04:32 +0000 (+0000)
Subject:  ca y est on peut regarder la liste des post d'un tracker
X-Git-Tag: xorg/old~1837
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c54a5ce0e414efeb5f19ff04f59f8ee055c5aff6;p=platal.git

 ca y est on peut regarder la liste des post d'un tracker
---

diff --git a/htdocs/css/default.css b/htdocs/css/default.css
index 3854a5c..9498b42 100644
--- a/htdocs/css/default.css
+++ b/htdocs/css/default.css
@@ -31,6 +31,13 @@ hr    { width: 90%; text-align: center }
 .middle { vertical-align: middle; }
 .smaller { font-size: smaller; font-style: italic; }
 
+.pri1, .pri2, .pri3, .pri4, .pri5 { color: inherit; }
+
+.pri1 { background-color: #dac0c0; font-style: italic; }
+.pri2 { background-color: #dab0b0; font-style: italic; }
+.pri3 { background-color: #daa0a0; }
+.pri4 { background-color: #da9090; }
+.pri5 { background-color: #da8080; font-weight: bold; }
 
 /**: II. :**/
 
@@ -333,4 +340,4 @@ div.long td.rt { width: 65%; }
     vertical-align: top;
 }
 /* vim: set et ts=4 sts=4 sw=4: */
-/* $Id: default.css,v 1.23 2004-02-20 11:44:06 x2000habouzit Exp $ */
+/* $Id: default.css,v 1.24 2004-02-23 18:04:32 x2000habouzit Exp $ */
diff --git a/htdocs/trackers/show.php b/htdocs/trackers/show.php
new file mode 100644
index 0000000..ecaf0a6
--- /dev/null
+++ b/htdocs/trackers/show.php
@@ -0,0 +1,21 @@
+<?php
+require('auto.prepend.inc.php');
+new_skinned_page('trackers/show.tpl', AUTH_COOKIE);
+require('tracker.inc.php');
+
+$tracker = new Tracker($_GET['tr_id']);
+
+if(empty($tracker->id) || !$tracker->perms_ok())
+    $page->failure();
+
+$page->assign('tracker', $tracker);
+
+$sql = "SELECT r.date,r.summary,r.pri,r.rq_id, a.username
+        FROM      trackers.requests AS r
+        LEFT JOIN auth_user_md5     AS a ON(r.admin_id=a.user_id)
+        WHERE tr_id = {$tracker->id}
+        ORDER BY pri DESC, r.date ASC";
+$page->mysql_assign($sql, 'requests');
+
+$page->run();   
+?>
diff --git a/include/tracker.inc.php b/include/tracker.inc.php
index 920ba9f..559c0bc 100644
--- a/include/tracker.inc.php
+++ b/include/tracker.inc.php
@@ -64,6 +64,16 @@ class Tracker {
                      FROM trackers.followups AS f,trackers.requests AS r
                      WHERE r.rq_id=f.rq_id AND r.tr_id='{$this->id}'");
     }
+
+    function perms_ok() {
+        if(has_perms())
+            return true;
+        if(logged() && $this->perms == 'auth')
+            return true;
+        if($this->perms=="public")
+            return true;
+        return false;
+    }
 }
 
 function tracker_clean_bd() {
diff --git a/include/xorg.session.inc.php b/include/xorg.session.inc.php
index 95ac896..3460ea7 100644
--- a/include/xorg.session.inc.php
+++ b/include/xorg.session.inc.php
@@ -100,11 +100,11 @@ class XorgSession extends DiogenesCoreSession {
 /** verifie si un utilisateur a les droits pour voir une page
  ** si ce n'est pas le cas, on affiche une erreur
  * @return void
- * TODO RECODER
  */
-function check_perms($auth_array=array()) {
+function check_perms() {
   global $page;
-  if (!has_perms($auth_array)) {
+  if (!has_perms()) {
+    require_once("diogenes.core.logger.inc.php");
     $_SESSION['log']->log("noperms",$_SERVER['PHP_SELF']);
     $page->failure();
   }
diff --git a/plugins/insert.mkStats.php b/plugins/insert.mkStats.php
index 4f9b16a..9f0cc34 100644
--- a/plugins/insert.mkStats.php
+++ b/plugins/insert.mkStats.php
@@ -48,12 +48,12 @@ function smarty_insert_mkStats($params, &$smarty)
         <tr class="impair">
           <td><a href="$rel/admin/valider.php">$stats_req</a></td>
           <td>
-            <a href="$rel/trackers/tracker_show.php?tr_id=2">
+            <a href="$rel/trackers/show.php?tr_id=2">
             <strong>{$nbtrk[0]}</strong> / {$nbtrk[1]}
             </a>
           </td>
           <td>
-            <a href="$rel/trackers/tracker_show.php?tr_id=1">
+            <a href="$rel/trackers/show.php?tr_id=1">
             <strong>{$nbtrk[2]}</strong> / {$nbtrk[3]}
             </a>
           </td>
diff --git a/scripts/migration.sql b/scripts/migration.sql
index 471faa6..4790de5 100644
--- a/scripts/migration.sql
+++ b/scripts/migration.sql
@@ -1,16 +1,26 @@
+-- passage à diogenes
 ALTER TABLE `logger.sessions` ADD `auth` ENUM( 'native' ) DEFAULT 'native' NOT NULL AFTER `id`;
 ALTER TABLE `logger.sessions` ADD `sauth` ENUM( 'native' ) DEFAULT 'native' NOT NULL AFTER `host`;
 
+-- gestion des skins
 ALTER TABLE `x4dat.skins` ADD COLUMN `skin_tpl` VARCHAR(32) AFTER `id`;
 
+
+-- modifs diogenes/logger
 USE logger;
 ALTER TABLE `events` DROP `id` ;
 ALTER TABLE `sessions` ADD INDEX ( `uid` );
 ALTER TABLE `sessions` ADD INDEX ( `uid` );
 ALTER TABLE `events` ADD INDEX ( `session` );
-
 USE diogenes;
 ALTER TABLE `diogenes_logevents` DROP `id` ;
 ALTER TABLE `diogenes_logsessions` ADD INDEX ( `uid` );
 ALTER TABLE `diogenes_logsessions` ADD INDEX ( `start` );
 ALTER TABLE `diogenes_logevents` ADD INDEX ( `session` );
+
+-- optim trackers
+USE trackers;
+DROP TABLE cat_abo;
+DROP TABLE categories;
+ALTER TABLE requests DROP COLUMN cat_id;
+ALTER TABLE requests ADD INDEX (tr_id);
diff --git a/templates/trackers/admin.tpl b/templates/trackers/admin.tpl
index 04074bc..6f43d12 100644
--- a/templates/trackers/admin.tpl
+++ b/templates/trackers/admin.tpl
@@ -1,4 +1,4 @@
-{* $Id: admin.tpl,v 1.3 2004-02-23 17:10:11 x2000habouzit Exp $ *}
+{* $Id: admin.tpl,v 1.4 2004-02-23 18:04:33 x2000habouzit Exp $ *}
 
 {literal}
 <script type="text/javascript">
@@ -43,7 +43,7 @@
   </tr>
 {foreach item=t from=$trackers}
   <tr class="{cycle values="impair,pair"}">
-    <td><a href="{"show.php?tr_id=`$t.tr_id`"|url}">{$t.tr_name}</a></td>
+    <td><a href="{"trackers/show.php?tr_id=`$t.tr_id`"|url}">{$t.tr_name}</a></td>
     <td>{$t.description}</td>
     <td class="right"><a href="mailto:{$t.ml_name}">{$t.short}</a></td>
     <td class="action">
@@ -68,7 +68,7 @@
   </tr>
 {foreach item=t from=$persos}
   <tr class="{cycle values="impair,pair"}">
-    <td><a href="{"show.php?tr_id=`$t.tr_id`"|url}">{$t.tr_name}</a></td>
+    <td><a href="{"trackers/show.php?tr_id=`$t.tr_id`"|url}">{$t.tr_name}</a></td>
     <td>{$t.description}</td>
     <td class="right"><a href="mailto:{$t.ml_name}">{$t.short}</a></td>
     <td class="action">
diff --git a/templates/trackers/show.tpl b/templates/trackers/show.tpl
new file mode 100644
index 0000000..57b79e9
--- /dev/null
+++ b/templates/trackers/show.tpl
@@ -0,0 +1,43 @@
+{* $Id: show.tpl,v 1.1 2004-02-23 18:04:33 x2000habouzit Exp $ *}
+
+{dynamic}
+
+<p class="normal">
+  [<a href="index.php">Liste des trackers</a>]
+  [<a href="post.php?tr_id={$smarty.get.tr_id}">Poster dans ce tracker</a>]
+</p>
+
+<div class="rubrique">
+  Tracker {$tracker->name}
+</div>
+<table class="bicol" cellpadding="3">
+  <tr>
+    <th>Date</th>
+    <th>Sujet</th>
+    <th>Assigné à</th>
+  </tr>
+{foreach item=rq from=$requests}
+  <tr class="pri{$rq.pri}">
+    <td>{$rq.date|date_format:"%m&nbsp;%Y"}</td>
+    <td><a href="show_rq.php?tr_id={$smarty.get.tr_id}&amp;rq_id={$rq.rq_id}">{$rq.summary}</a></td>
+    <td class="right">{if $rq.username}<a href="mailto:{$rq.username}@polytechnique.org">{$rq.username}</a>{else}-{/if}</td>
+  </tr>
+{/foreach}
+</table>
+{/dynamic}
+
+<br />
+<div class="ssrubrique">
+  Couleurs des priorités
+</div>
+<table summary="priorités">
+  <tr>
+    <td class="pri1">1</td>
+    <td class="pri2">2</td>
+    <td class="pri3">3</td>
+    <td class="pri4">4</td>
+    <td class="pri5">5</td>
+  </tr>
+</table>
+
+{* vim:set et sw=2 sts=2 sws=2: *}