Changeset fd09a48

Timestamp:

Dec 2, 2019, 2:21:21 AM (8 months ago)

Author:

BlackLight <blacklight@…>

Branches:

master

Children:

5685409

Parents:

0fb135d

Message:

Исправлено отображение журнала изменений

Files:

• build/deb/make_packet.php (modified) (2 diffs)
• web/include/modules/service/changelog.php (modified) (1 diff)

build/deb/make_packet.php

@@ -93 +93 @@
         $xml->startElement('log');
         $logs = explode("\n", $log);
-        $revnum = $this->revision;
+        $revnum = 1;
         foreach ($logs as $line) {
             $info = explode(":::", trim($line));
             $xml->startElement('logentry');
-            $xml->writeAttribute('number', $revnum);
+            $xml->writeAttribute('revision', $revnum);
             $xml->writeElement('author', $info[0]);
             $xml->writeElement('date', $info[1]);
             $xml->writeElement('msg', $info[2]);
             $xml->endElement();
-            $revnum--;
+            $revnum++;
         }
         $xml->endElement();
@@ -111 +111 @@
         chdir($this->repoDir);
         $this->revision = trim(`git rev-list {$this->repoBranch} --count`);
-        $log = `git log --pretty=format:"%an:::%ad:::%s" --date=short`;
+        $log = `git log --pretty=format:"%an:::%ad:::%s" --date=short --reverse`;
         echo $this->saveGitRevLog($log);
         chdir($this->runDir);

web/include/modules/service/changelog.php

@@ -63 +63 @@
     }
     
-    public function getLastChanges($count = 5) {
+    public function getLastChanges($count = 10) {
         $logdata = $this->logdata;
         $ret = '';
+        $lastmsg = '';
         while($count>0 && count($logdata)>0) {
             $item = array_pop($logdata);
-            if($item['msg']=='') {
+            if($item['msg']=='' || $item['msg'] === $lastmsg || strpos($item['msg'], 'Merge pull request')===0) {
                 continue;
             }
+            $lastmsg = $item['msg'];
             $ret .= "<p><b>".date("Y-m-d", $item['date']).", ".$item['author'].':</b><br>';
             $ret .= str_replace("\n", "<br>", $item['msg']);