[freeside-commits] branch master updated. 3b1fda960515886ee4306b94fc60ccad196f1358
Ivan
ivan at 420.am
Tue Dec 23 12:19:35 PST 2014
The branch, master has been updated
via 3b1fda960515886ee4306b94fc60ccad196f1358 (commit)
via 2fc2924eeebcd3951cbf862da44729187f35ca8d (commit)
via 4d1538fc4294672a24d0abead9f9020677308f8f (commit)
via 0d4ae469251e8ee4b9719aae2766528f587d654f (commit)
via 8a352c47c36ff71877fb341f8525c93b1108607c (commit)
from 9e77fe17c8a593f45ffd7df5b2611ae908c4345d (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 3b1fda960515886ee4306b94fc60ccad196f1358
Author: Ivan Kohler <ivan at freeside.biz>
Date: Tue Dec 23 12:19:34 2014 -0800
agent-virt outgoing message log, RT#32703
diff --git a/httemplate/search/cust_msg.html b/httemplate/search/cust_msg.html
index 2b6f08e..486c7b0 100644
--- a/httemplate/search/cust_msg.html
+++ b/httemplate/search/cust_msg.html
@@ -1,51 +1,51 @@
-<& 'elements/search.html',
- 'title' => $title,
- 'name_singular' => 'message',
- 'query' => $query,
- 'count_query' => $count_query,
- 'header' => [
- 'Date',
- 'Type',
- 'Destination',
- 'Status',
- '', #error
- ],
- 'fields' => [
- sub {
- my $date = $_[0]->_date;
- $date ? time2str('%Y-%m-%d %T',$_[0]->_date) : ''
- },
- sub {
- ucfirst($_[0]->msgtype) || $_[0]->msgname
- },
- sub {
- join('<BR>', split(/,\s*/, $_[0]->env_to) )
- },
- 'status',
- sub { encode_entities($_[0]->error) },
- ],
- 'sort_fields' => [ '_date',
- 'msgtype',
- 'env_to',
- 'status',
- 'error',
- ],
- 'align' => 'rllcl',
- 'links' => [ ],
+<& elements/search.html,
+ 'title' => $title,
+ 'name_singular' => 'message',
+ 'query' => $query,
+ 'count_query' => $count_query,
+ 'header' => [
+ 'Date',
+ 'Type',
+ 'Destination',
+ 'Status',
+ '', #error
+ ],
+ 'fields' => [
+ sub {
+ my $date = $_[0]->_date;
+ $date ? time2str('%Y-%m-%d %T',$_[0]->_date) : ''
+ },
+ sub {
+ ucfirst($_[0]->msgtype) || $_[0]->msgname
+ },
+ sub {
+ join('<BR>', split(/,\s*/, $_[0]->env_to) )
+ },
+ 'status',
+ sub { encode_entities($_[0]->error) },
+ ],
+ 'sort_fields' => [ '_date',
+ 'msgtype',
+ 'env_to',
+ 'status',
+ 'error',
+ ],
+ 'align' => 'rllcl',
+ 'links' => [],
'link_onclicks' => [
- $sub_popup_link,
- $sub_popup_link,
- $sub_popup_link,
- '',
- '',
- ],
- 'color' => [ '',
- $typecolor,
- '',
- $statuscolor,
- $statuscolor,
- ],
- 'html_init' => $html_init,
+ $sub_popup_link,
+ $sub_popup_link,
+ $sub_popup_link,
+ '',
+ '',
+ ],
+ 'color' => [ '',
+ $typecolor,
+ '',
+ $statuscolor,
+ $statuscolor,
+ ],
+ 'html_init' => $html_init,
'really_disable_download' => 1,
@_
&>
@@ -58,7 +58,12 @@ my $conf = new FS::Conf;
my $title = 'Outgoing Message Log';
-my @where;
+#here is the agent virtualization
+my $agentnums_sql =
+ $FS::CurrentUser::CurrentUser->agentnums_sql( 'table' => 'cust_main' );
+
+my @where = ( $agentnums_sql );
+
if ( $cgi->param('status') =~ /^(\w+)$/ ) {
push @where, "status = '$1'";
}
@@ -76,20 +81,22 @@ if ( $cgi->param('order_by') =~ /^(\w+)$/ ) {
$order_by = $1;
}
-my $where = '';
-$where = ' WHERE '.join(' AND ', @where) if @where;
+my $where = ' WHERE '. join(' AND ', @where);
+
+my $join_cust_main = ' LEFT JOIN cust_main USING ( custnum ) ';
+
my $query = {
'table' => 'cust_msg',
'select' => join(', ',
'cust_msg.*',
'msg_template.msgname',
),
- 'addl_from' => ' LEFT JOIN msg_template USING ( msgnum )',
+ 'addl_from' => ' LEFT JOIN msg_template USING ( msgnum ) '. $join_cust_main,
'hashref' => {},
'extra_sql' => $where,
'order_by' => "ORDER BY $order_by",
};
-my $count_query = 'SELECT COUNT(*) FROM cust_msg'.$where;
+my $count_query = "SELECT COUNT(*) FROM cust_msg $join_cust_main $where";
my $sub_popup_link = sub {
my $custmsgnum = $_[0]->custmsgnum;
commit 2fc2924eeebcd3951cbf862da44729187f35ca8d
Merge: 4d1538f 9e77fe1
Author: Ivan Kohler <ivan at freeside.biz>
Date: Tue Dec 23 12:19:30 2014 -0800
Merge branch 'master' of git.freeside.biz:/home/git/freeside
commit 4d1538fc4294672a24d0abead9f9020677308f8f
Author: Ivan Kohler <ivan at freeside.biz>
Date: Tue Dec 23 10:12:56 2014 -0800
unused, but removing old domains anyway
diff --git a/rpm/freeside.spec b/rpm/freeside.spec
index 548444e..bac6ff8 100644
--- a/rpm/freeside.spec
+++ b/rpm/freeside.spec
@@ -8,9 +8,9 @@ Version: %{version}
Release: %{release}
License: AGPLv3
Group: Applications/Internet
-URL: http://www.sisd.com/freeside/
+URL: http://www.freeside.biz/freeside/
Vendor: Freeside
-Source: http://www.sisd.com/freeside/%{name}-%{version}.tar.gz
+Source: http://www.freeside.biz/freeside/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
Requires: %{name}-frontend
commit 0d4ae469251e8ee4b9719aae2766528f587d654f
Author: Ivan Kohler <ivan at freeside.biz>
Date: Tue Dec 23 10:12:02 2014 -0800
remove old domains
diff --git a/Makefile b/Makefile
index 271a361..67bf83c 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@ RT_ENABLED = 1
RT_DOMAIN = example.com
RT_TIMEZONE = US/Pacific
#RT_TIMEZONE = US/Eastern
-FREESIDE_URL = "http://localhost/freeside/"
+FREESIDE_URL = "http://192.168.1.6/freeside/"
#for now, same db as specified in DATASOURCE... eventually, otherwise?
RT_DB_DATABASE = freeside
@@ -460,7 +460,7 @@ release:
#cd /home/ivan
git archive --prefix=freeside-${VERSION}/ ${TAG} | gzip -9 >freeside-${VERSION}.tar.gz
- scp freeside-${VERSION}.tar.gz ivan at 420.am:/var/www/www.sisd.com/freeside/
+ scp freeside-${VERSION}.tar.gz ivan at freeside.biz:/var/www/www.freeside.biz/freeside/
mv freeside-${VERSION}.tar.gz ..
#these things failing should not make release target fail, so: "|| true"
commit 8a352c47c36ff71877fb341f8525c93b1108607c
Author: Ivan Kohler <ivan at freeside.biz>
Date: Tue Dec 23 10:11:05 2014 -0800
remove obsolete doc
diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
deleted file mode 100644
index 3b419de..0000000
--- a/httemplate/docs/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<head>
- <title>Freeside Documentation</title>
-</head>
-<body bgcolor="#ffffff">
- <h1>Freeside Documentation</h1>
-<img src="overview-new.png">
-<h3>Installation and upgrades</h3>
-<ul>
- <li><a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation:Installation">New Installation</a>
- <li><a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation:RT_Installation">Installing integrated RT ticketing</a>
- <li><a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation:Self-Service_Installation">Signup/Self-service installation</a>
- <li><a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation:Upgrading">Upgrading from 1.5.8 or 1.6.X</a>
-</ul>
-<h3>Configuration and setup</h3>
-<ul>
-<!--
- <li><a href="config.html">Configuration files</a>
-!-->
- <li><a href="admin.html">Administration</a>
-<!--
- <li><a href="../index.html#admin">Administration</a>
-!-->
- <li><a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation:Administration#Exports_.28provisioning.29">Exports</a>
- <li><a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation:Administration#Billing">Billing</a>
-</ul>
-<h3>Developer</h3>
-<ul>
- <li><a href="schema.html">Schema reference</a>
- <li><a href="man/FS.html">Perl API</a>
- <li><a href="legacy.html">Importing legacy data</a>
-</ul>
-</body>
-----------------------------------------------------------------------
Summary of changes:
Makefile | 4 +-
httemplate/docs/index.html | 32 -----------
httemplate/search/cust_msg.html | 111 +++++++++++++++++++++------------------
rpm/freeside.spec | 4 +-
4 files changed, 63 insertions(+), 88 deletions(-)
delete mode 100644 httemplate/docs/index.html
More information about the freeside-commits
mailing list