[freeside-commits] freeside/httemplate/view svc_broadband.cgi, 1.17, 1.17.2.1 svc_domain.cgi, 1.31, 1.31.2.1 svc_external.cgi, 1.9, 1.9.4.1 svc_forward.cgi, 1.18, 1.18.4.1 svc_www.cgi, 1.20, 1.20.4.1

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view
In directory wavetail.420.am:/tmp/cvs-serv6583

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	svc_broadband.cgi svc_domain.cgi svc_external.cgi 
	svc_forward.cgi svc_www.cgi 
Log Message:
fix viewing unlinked forwards, domains, broadband/external/www services, RT#6794

Index: svc_www.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_www.cgi,v
retrieving revision 1.20
retrieving revision 1.20.4.1
diff -u -d -r1.20 -r1.20.4.1
--- svc_www.cgi	22 Feb 2009 21:11:21 -0000	1.20
+++ svc_www.cgi	2 Dec 2009 20:51:44 -0000	1.20.4.1
@@ -67,7 +67,9 @@
                  ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
                  ' LEFT JOIN cust_main USING ( custnum ) ',
   'hashref'   => { 'svcnum' => $svcnum },
-  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql(
+                            'null_right' => 'View/link unlinked services'
+                          ),
 }) or die "svc_www: Unknown svcnum $svcnum";
 
 #false laziness w/all svc_*.cgi

Index: svc_external.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_external.cgi,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -u -d -r1.9 -r1.9.4.1
--- svc_external.cgi	3 Dec 2008 21:12:20 -0000	1.9
+++ svc_external.cgi	2 Dec 2009 20:51:44 -0000	1.9.4.1
@@ -41,7 +41,9 @@
                  ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
                  ' LEFT JOIN cust_main USING ( custnum ) ',
   'hashref'   => { 'svcnum' => $svcnum },
-  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql(
+                            'null_right' => 'View/link unlinked services'
+                          ),
 }) or die "svc_external: Unknown svcnum $svcnum";
 
 my $conf = new FS::Conf;

Index: svc_broadband.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_broadband.cgi,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- svc_broadband.cgi	14 Sep 2009 23:52:01 -0000	1.17
+++ svc_broadband.cgi	2 Dec 2009 20:51:44 -0000	1.17.2.1
@@ -168,7 +168,9 @@
                  ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
                  ' LEFT JOIN cust_main USING ( custnum ) ',
   'hashref'   => { 'svcnum' => $svcnum },
-  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql(
+                            'null_right' => 'View/link unlinked services'
+                          ),
 }) or die "svc_broadband: Unknown svcnum $svcnum";
 
 #false laziness w/all svc_*.cgi

Index: svc_domain.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_domain.cgi,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -d -r1.31 -r1.31.2.1
--- svc_domain.cgi	23 Jun 2009 20:33:10 -0000	1.31
+++ svc_domain.cgi	2 Dec 2009 20:51:44 -0000	1.31.2.1
@@ -150,7 +150,9 @@
                  ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
                  ' LEFT JOIN cust_main USING ( custnum ) ',
   'hashref'   => {'svcnum'=>$svcnum},
-  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql(
+                            'null_right' => 'View/link unlinked services'
+                          ),
 });
 die "Unknown svcnum" unless $svc_domain;
 

Index: svc_forward.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_forward.cgi,v
retrieving revision 1.18
retrieving revision 1.18.4.1
diff -u -d -r1.18 -r1.18.4.1
--- svc_forward.cgi	3 Dec 2008 21:12:20 -0000	1.18
+++ svc_forward.cgi	2 Dec 2009 20:51:44 -0000	1.18.4.1
@@ -56,7 +56,9 @@
                  ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
                  ' LEFT JOIN cust_main USING ( custnum ) ',
   'hashref'   => {'svcnum'=>$svcnum},
-  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql(
+                            'null_right' => 'View/link unlinked services'
+                          ),
 });
 die "Unknown svcnum" unless $svc_forward;