diff options
| author | ivan <ivan> | 2009-12-02 20:51:44 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2009-12-02 20:51:44 +0000 |
| commit | bfb50b19988ff9010eda5d3ce87d99b5db32b9a0 (patch) | |
| tree | 5488127b275648698b8d6dffa1c88d09cc3e94fb | |
| parent | 6e7fff43136c356d24255896dff7df3fc4d8ee40 (diff) | |
fix viewing unlinked forwards, domains, broadband/external/www services, RT#6794
| -rw-r--r-- | httemplate/view/svc_broadband.cgi | 4 | ||||
| -rwxr-xr-x | httemplate/view/svc_domain.cgi | 4 | ||||
| -rw-r--r-- | httemplate/view/svc_external.cgi | 4 | ||||
| -rwxr-xr-x | httemplate/view/svc_forward.cgi | 4 | ||||
| -rw-r--r-- | httemplate/view/svc_www.cgi | 4 |
5 files changed, 15 insertions, 5 deletions
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi index 1463925b4..f552e9bc7 100644 --- a/httemplate/view/svc_broadband.cgi +++ b/httemplate/view/svc_broadband.cgi @@ -168,7 +168,9 @@ my $svc_broadband = qsearchs({ ' 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 diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi index fc099d85c..a9fc775ee 100755 --- a/httemplate/view/svc_domain.cgi +++ b/httemplate/view/svc_domain.cgi @@ -150,7 +150,9 @@ my $svc_domain = qsearchs({ ' 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; diff --git a/httemplate/view/svc_external.cgi b/httemplate/view/svc_external.cgi index 222f36a85..77679d81c 100644 --- a/httemplate/view/svc_external.cgi +++ b/httemplate/view/svc_external.cgi @@ -41,7 +41,9 @@ my $svc_external = qsearchs({ ' 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; diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi index ff84a282f..0847a5e65 100755 --- a/httemplate/view/svc_forward.cgi +++ b/httemplate/view/svc_forward.cgi @@ -56,7 +56,9 @@ my $svc_forward = qsearchs({ ' 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; diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi index cb1a3bbdf..935d139e9 100644 --- a/httemplate/view/svc_www.cgi +++ b/httemplate/view/svc_www.cgi @@ -67,7 +67,9 @@ my $svc_www = qsearchs({ ' 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 |