Indefero Commit Details

Date:

2011-06-04 16:15:58 (14 years 6 months ago)

Author:

Thomas Keller

Branch:

develop, feature.content-md5, feature.diff-whitespace, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, release-1.2, release-1.3

Commit:

1b1b00a10c2cca8c0460b8731c445098e870da1b

Parents:

8693418d397836301946d974e0b8fca9f18790c9

Message:

The server list no longer renders a bogus server entry in case no monotone server has been configured yet in the connected usher instance. Also display a short info text if the server or connection list for a running monotone server is empty.

Changes:

File differences

-17
18 18
19 19
20
21
22
20 23
21 24
22 25
+- Fix SSH public key parsing issues and improve the check for existing, uploaded keys (issue 679)␊
- Diff views now show empty context lines for git and hg again (issue 688)␊
- Let the SVN command line client not store the login credentials we give him as arguments␊
- The usher section in the forge administration no longer displays a bogus␊
  server enty in case no monotone server is configured in the connected␊
  usher instance␊
␊
## Documentation␊
␊
 - Fix SSH public key parsing issues and improve the check for existing, uploaded keys (issue 679)␊
 - Diff views now show empty context lines for git and hg again (issue 688)␊
 - Let the SVN command line client not store the login credentials we give him as arguments␊
+- The usher section in the forge administration no longer displays a bogus␊
+  server enty in case no monotone server is configured in the connected␊
+  usher instance␊
 ␊
 ## Documentation␊
 ␊

-48
49 49
50 50
51 
51
52 52
53 53
54 54
... ...
73 73
74 74
75 75
76 
76
77 77
78 78
79 79
+        if ($conn == 'none')␊
            return array();␊
␊
        return preg_split('/[ ]/', $conn);␊
        return preg_split('/[ ]/', $conn, -1, PREG_SPLIT_NO_EMPTY);␊
    }␊
␊
    /**␊

        if ($conn == 'none')␊
            return array();␊
␊
        $single_conns = preg_split('/[ ]/', $conn);␊
        $single_conns = preg_split('/[ ]/', $conn, -1, PREG_SPLIT_NO_EMPTY);␊
        $ret = array();␊
        foreach ($single_conns as $conn) {␊
            preg_match('/\((\w+)\)([^:]+):(\d+)/', $conn, $matches);␊
 ...
         if ($conn == 'none')␊
             return array();␊
 ␊
-        return preg_split('/[ ]/', $conn);␊
+        return preg_split('/[ ]/', $conn, -1, PREG_SPLIT_NO_EMPTY);␊
     }␊
 ␊
     /**␊
         if ($conn == 'none')␊
             return array();␊
 ␊
-        $single_conns = preg_split('/[ ]/', $conn);␊
+        $single_conns = preg_split('/[ ]/', $conn, -1, PREG_SPLIT_NO_EMPTY);␊
         $ret = array();␊
         foreach ($single_conns as $conn) {␊
             preg_match('/\((\w+)\)([^:]+):(\d+)/', $conn, $matches);␊

-8
9 9
10 10
11
12
13
14
15
11 16
12 17
13 18
14 19
15 20
16 21
22
17 23
18 24
19 25
+    <th>{trans "address"}</th>␊
    <th>{trans "port"}</th>␊
</tr>␊
{if count($connections) == 0}␊
<tr>␊
    <td colspan="2" align="center">{trans 'No connections found.'}</td>␊
</tr>␊
{else}␊
{foreach $connections as $connection}␊
<tr>␊
    <td>{$connection.address}</td>␊
    <td>{$connection.port}</td>␊
</tr>␊
{/foreach}␊
{/if}␊
</table>␊
{/block}␊
␊
     <th>{trans "address"}</th>␊
     <th>{trans "port"}</th>␊
 </tr>␊
+{if count($connections) == 0}␊
+<tr>␊
+    <td colspan="2" align="center">{trans 'No connections found.'}</td>␊
+</tr>␊
+{else}␊
 {foreach $connections as $connection}␊
 <tr>␊
     <td>{$connection.address}</td>␊
     <td>{$connection.port}</td>␊
 </tr>␊
 {/foreach}␊
+{/if}␊
 </table>␊
 {/block}␊
 ␊

-9
10 10
11 11
12
13
14
15
16
12 17
13 18
14 19
... ...
31 36
32 37
33 38
39
34 40
35 41
36 42
+    <th>{trans "status"}</th>␊
    <th>{trans "action"}</th>␊
</tr>␊
{if count($servers) == 0}␊
<tr>␊
    <td colspan="3" align="center">{trans 'No monotone servers configured.'}</td>␊
</tr>␊
{else}␊
{foreach $servers as $server}␊
<tr>␊
    <td>{$server.name}</td>␊

        {/if}␊
</tr>␊
{/foreach}␊
{/if}␊
</table>␊
{/block}␊
␊
 ...
     <th>{trans "status"}</th>␊
     <th>{trans "action"}</th>␊
 </tr>␊
+{if count($servers) == 0}␊
+<tr>␊
+    <td colspan="3" align="center">{trans 'No monotone servers configured.'}</td>␊
+</tr>␊
+{else}␊
 {foreach $servers as $server}␊
 <tr>␊
     <td>{$server.name}</td>␊
         {/if}␊
 </tr>␊
 {/foreach}␊
+{/if}␊
 </table>␊
 {/block}␊
 ␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags