projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6f5ff90
)
fix viewing unlinked forwards, domains, broadband/external/www services, RT#6794
author
ivan
<ivan>
Wed, 2 Dec 2009 20:51:43 +0000
(20:51 +0000)
committer
ivan
<ivan>
Wed, 2 Dec 2009 20:51:43 +0000
(20:51 +0000)
httemplate/view/svc_broadband.cgi
patch
|
blob
|
history
httemplate/view/svc_domain.cgi
patch
|
blob
|
history
httemplate/view/svc_external.cgi
patch
|
blob
|
history
httemplate/view/svc_forward.cgi
patch
|
blob
|
history
httemplate/view/svc_www.cgi
patch
|
blob
|
history
diff --git
a/httemplate/view/svc_broadband.cgi
b/httemplate/view/svc_broadband.cgi
index
1463925
..
f552e9b
100644
(file)
--- 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 },
' 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
}) 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
fc099d8
..
a9fc775
100755
(executable)
--- 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},
' 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;
});
die "Unknown svcnum" unless $svc_domain;
diff --git
a/httemplate/view/svc_external.cgi
b/httemplate/view/svc_external.cgi
index
222f36a
..
77679d8
100644
(file)
--- 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 },
' 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;
}) 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
ff84a28
..
0847a5e
100755
(executable)
--- 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},
' 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;
});
die "Unknown svcnum" unless $svc_forward;
diff --git
a/httemplate/view/svc_www.cgi
b/httemplate/view/svc_www.cgi
index
cb1a3bb
..
935d139
100644
(file)
--- 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 },
' 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
}) or die "svc_www: Unknown svcnum $svcnum";
#false laziness w/all svc_*.cgi