Author: jfthomps
Date: Tue Mar 28 13:11:45 2017
New Revision: 1789127
URL: http://svn.apache.org/viewvc?rev=1789127&view=rev
Log:
VCL-1029 - add a section for managing affiliations to Site Configuration
siteconfig.php: modified generalOptions: fixed problem from last commit where
conditional checking for user having global site configuration permissions was
around the wrong lines
Modified:
vcl/trunk/web/.ht-inc/siteconfig.php
Modified: vcl/trunk/web/.ht-inc/siteconfig.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/siteconfig.php?rev=1789127&r1=1789126&r2=1789127&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/siteconfig.php (original)
+++ vcl/trunk/web/.ht-inc/siteconfig.php Tue Mar 28 13:11:45 2017
@@ -71,11 +71,11 @@ function generalOptions($globalopts) {
$h .= "<div id=\"siteconfiglayout\">\n";
# -------- left column ---------
+ $h .= "<div id=\"siteconfigleftcol\">\n";
if(! checkUserHasPerm('Site Configuration (global)')) {
- $h .= "<div id=\"siteconfigleftcol\">\n";
$obj = new Affiliations();
+ $h .= $obj->getHTML($globalopts);
}
- $h .= $obj->getHTML($globalopts);
$obj = new connectedUserCheck();
$h .= $obj->getHTML($globalopts);
$obj = new acknowledge();
