[freeside-commits] branch master updated. f6860de28c7d561312b6ba1e6fb67799a08c7306

[Mark Wells]

The branch, master has been updated
       via  f6860de28c7d561312b6ba1e6fb67799a08c7306 (commit)
       via  f673db50d866ac1b64bb80b09bd81071d089bf41 (commit)
      from  b25efe03cc7945773363ba74e2012646c258a1b5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f6860de28c7d561312b6ba1e6fb67799a08c7306
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Aug 4 13:03:48 2015 -0700

    rename view/svc_circuit.html to fix links from package reports, #37420

diff --git a/httemplate/edit/process/svc_circuit.html b/httemplate/edit/process/svc_circuit.html
index 27f43db..06cd7e7 100644
--- a/httemplate/edit/process/svc_circuit.html
+++ b/httemplate/edit/process/svc_circuit.html
@@ -1,7 +1,7 @@
 <& elements/svc_Common.html,
     table       => 'svc_circuit',
     edit_ext    => 'html',
-    redirect    => popurl(3)."view/svc_circuit.html?",
+    redirect    => popurl(3)."view/svc_circuit.cgi?",
     precheck_callback => $precheck,
 &>
 <%init>
diff --git a/httemplate/search/svc_circuit.cgi b/httemplate/search/svc_circuit.cgi
old mode 100755
new mode 100644
index c14c55f..8f05e04
--- a/httemplate/search/svc_circuit.cgi
+++ b/httemplate/search/svc_circuit.cgi
@@ -3,7 +3,7 @@
   'name'        => 'circuit services',
   'query'       => $query,
   'count_query' => $query->{'count_query'},
-  'redirect'    => [ popurl(2). "view/svc_circuit.html?", 'svcnum' ],
+  'redirect'    => [ popurl(2). "view/svc_circuit.cgi?", 'svcnum' ],
   'header'      => [ '#',
                      'Provider',
                      'Type',
@@ -60,6 +60,6 @@ if ( $cgi->param('magic') eq 'unlinked' ) {
 
 my $query = FS::svc_circuit->search(\%search_hash);
 
-my $link = [ $p.'view/svc_circuit.html?', 'svcnum' ];
+my $link = [ $p.'view/svc_circuit.cgi?', 'svcnum' ];
 
 </%init>
diff --git a/httemplate/view/svc_circuit.html b/httemplate/view/svc_circuit.cgi
similarity index 100%
rename from httemplate/view/svc_circuit.html
rename to httemplate/view/svc_circuit.cgi
diff --git a/httemplate/view/svc_phone.cgi b/httemplate/view/svc_phone.cgi
index b71e094..ab69c4f 100644
--- a/httemplate/view/svc_phone.cgi
+++ b/httemplate/view/svc_phone.cgi
@@ -56,7 +56,7 @@ if ( $conf->exists('svc_phone-lnp') ) {
 
 $labels{circuit_label} = mt('Circuit');
 push @fields, { field => 'circuit_label',
-                link => [ $p.'view/svc_circuit.html?', 'circuit_svcnum' ]
+                link => [ $p.'view/svc_circuit.cgi?', 'circuit_svcnum' ]
               };
 
 push @fields, 'sip_server';

commit f673db50d866ac1b64bb80b09bd81071d089bf41
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Aug 4 12:43:50 2015 -0700

    don't create test htpasswd on 4.x

diff --git a/FS-Test/bin/freeside-test-start b/FS-Test/bin/freeside-test-start
index 596879e..eca2e03 100755
--- a/FS-Test/bin/freeside-test-start
+++ b/FS-Test/bin/freeside-test-start
@@ -37,15 +37,6 @@ if [ $createdb = YES ]; then
   sudo -u freeside psql freeside -q -f $sharedir/test.sql > /dev/null
 fi
 
-if [ -f /usr/local/etc/freeside/htpasswd ]; then
-  newhtpasswd=htpasswd_`date +%Y%m%d`
-  echo "Renaming htpasswd to $newhtpasswd."
-  sudo mv /usr/local/etc/freeside/htpasswd /usr/local/etc/freeside/$newhtpasswd
-fi
-
-echo "Installing new htpasswd."
-sudo cp $sharedir/htpasswd /usr/local/etc/freeside/htpasswd
-
 newtime=$(sudo -u freeside \
   psql -tc 'SELECT to_timestamp(max(_date) + 86400) FROM cust_bill' \
 )
diff --git a/FS-Test/bin/freeside-test-stop b/FS-Test/bin/freeside-test-stop
index 5066890..2c62c10 100755
--- a/FS-Test/bin/freeside-test-stop
+++ b/FS-Test/bin/freeside-test-stop
@@ -14,20 +14,6 @@ if psql -l |grep -q '^ *freeside '; then
   psql postgres -c "ALTER DATABASE freeside RENAME TO $newname"
 fi
 
-if (sudo grep -q '^test:' /usr/local/etc/freeside/htpasswd); then
-  newhtpasswd=htpasswd_test_`date +%Y%m%d`
-  echo "Renaming htpasswd to $newhtpasswd."
-  sudo mv /usr/local/etc/freeside/htpasswd /usr/local/etc/freeside/$newhtpasswd
-  oldhtpasswd=$( cd /usr/local/etc/freeside; \
-                 ls |grep -P 'htpasswd_\d{8}' | \
-                 sort -nr |head -1 )
-  if [ -f $oldhtpasswd ]; then
-    echo "Renaming $oldhtpasswd to htpasswd."
-    sudo mv /usr/local/etc/freeside/$oldhtpasswd \
-      /usr/local/etc/freeside/htpasswd
-  fi
-fi
-
 oldname=$( psql -tl | \
            cut -d '|' -f 1 | \
            tr -d ' ' | \

-----------------------------------------------------------------------

Summary of changes:
 FS-Test/bin/freeside-test-start                       |    9 ---------
 FS-Test/bin/freeside-test-stop                        |   14 --------------
 httemplate/edit/process/svc_circuit.html              |    2 +-
 httemplate/search/svc_circuit.cgi                     |    4 ++--
 httemplate/view/{svc_circuit.html => svc_circuit.cgi} |    0
 httemplate/view/svc_phone.cgi                         |    2 +-
 6 files changed, 4 insertions(+), 27 deletions(-)
 mode change 100755 => 100644 httemplate/search/svc_circuit.cgi
 rename httemplate/view/{svc_circuit.html => svc_circuit.cgi} (100%)