/[smecontribs]/rpms/smeserver-git/contribs10/smeserver-git-1.2.0-bz9629.patch
ViewVC logotype

Annotation of /rpms/smeserver-git/contribs10/smeserver-git-1.2.0-bz9629.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Sat Mar 25 03:20:13 2023 UTC (19 months, 2 weeks ago) by jpp
Branch: MAIN
CVS Tags: smeserver-git-1_2_0-12_el7_sme, smeserver-git-1_2_0-11_el7_sme, HEAD
* Fri Mar 24 2023 Jean-Philippe Pialasse <tests@pialasse.com> 1.2.0-11.sme
- fix system and domaine name not taken into account in manager [SME: 9629]

1 jpp 1.1 diff -Nur --no-dereference smeserver-git-1.2.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/git.pm smeserver-git-1.2.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/git.pm
2     --- smeserver-git-1.2.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/git.pm 2013-02-09 21:49:54.000000000 -0500
3     +++ smeserver-git-1.2.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/git.pm 2023-03-24 23:16:40.664000000 -0400
4     @@ -85,6 +85,10 @@
5    
6     our $git_db = esmith::GitDB->open
7     or die "Can't open the Git database : $!\n" ;
8     +
9     +our $SystemName = $config_db->get_prop('git','SystemName') || get_config_value('', 'SystemName');
10     +our $DomainName = $config_db->get_prop('git','DomainName') || get_config_value('', 'DomainName');
11     +our $server = $SystemName . "." . $DomainName ;
12    
13     # fields and records separator for sub records
14     use constant FS => "," ;
15     @@ -154,7 +158,6 @@
16     my $q = $self->{cgi};
17    
18     print qq(<tr>);
19     - my $server = get_config_value('', 'SystemName') . "." . get_config_value('', 'DomainName');
20     print qq(<td><p>) . $self->localise('GIT_HOME_DESCRIPTION', {serverName => $server} ) . qq(</p></td>);
21     print qq(<td><a href="http://git-scm.com" target="_blank"><img src="/server-common/git-logo.png" alt="GIT" style="float:right;margin:0 0 0 5px;" /></a></td>);
22     print qq(</tr>);
23     @@ -242,8 +245,8 @@
24     my $href = "$scriptname?$params&action=modify&wherenext=";
25     my $actionModify = '&nbsp;' . $q->a({href => "${href}GitCreateModify"},$modify) . '&nbsp;';
26     my $actionRemove = '&nbsp;' . $q->a({href => "${href}GitRemove"}, $remove) . '&nbsp';
27     - my $repo_url = $q->a({href => "https://" . get_config_value('', 'SystemName') . "."
28     - . get_config_value('', 'DomainName') . "/git/"
29     + my $repo_url = $q->a({href => "https://" . $SystemName . "."
30     + . $DomainName . "/git/"
31     . $repo_name . ".git" }, $repo_name . ".git" );
32    
33     print $q->Tr ( esmith::cgi::genSmallCell($q, $repo_url, "normal"),

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed