Remove blank fields from document when editing
Former-commit-id: ab048b05d5efa648a7e99110f6a68ebf11196d72
--- /dev/null
+++ b/admin/refreshDesignDoc.php
@@ -1,1 +1,7 @@
+<?php
+require_once '../include/common.inc.php';
+$db = $server->get_db('disclosr-agencies');
+createAgencyDesignDoc();
+?>
+
--- a/alaveteli/exportAgencies.csv.php
+++ b/alaveteli/exportAgencies.csv.php
@@ -34,13 +34,13 @@
$row["#id"] = $agency->value->_id;
$row["name"] = $agency->value->name;
if (isset($agency->value->foi_email)) {
- $row["request_email"] = $agency->value->foi_email;
+ $row["request_email"] = $agency->value->foiEmail;
} else {
$row["request_email"] = "foi@".GetDomain($agency->value->website);
//
}
- if (isset($agency->value->short_name)) {
- $row["short_name"] = $agency->value->short_name;
+ if (isset($agency->value->shortName)) {
+ $row["short_name"] = $agency->value->shortName;
} else {
$out = Array();
preg_match_all('/[A-Z]/', $agency->value->name, $out);
--- a/getAgency.php
+++ b/getAgency.php
@@ -31,8 +31,9 @@
} else {
if (strpos($key, "_") === 0) {
echo"<input type='hidden' id='$key' name='$key' value='$value'/>";
+
} else if ($key == "parentOrg") {
- echo "<label for='$key'>$key</label><select id='$key' name='$key'>";
+ echo "<label for='$key'>$key</label><select id='$key' name='$key'><option value=''> Select... </option>";
$rows = $db->get_view("app", "byDeptStateName")->rows;
//print_r($rows);
foreach ($rows as $row) {
@@ -40,7 +41,7 @@
}
echo" </select>";
} else if (strpos($key, "has") === 0) {
- echo "<label for='$key'><input type='checkbox' id='$key' name='$key' ".(($value=='true')?"checked='$value'":"")."> $key</label>";
+ echo "<label for='$key'><input type='checkbox' id='$key' name='$key' ".(($value=='on' || $value=='true')?"checked='$value'":"")."> $key</label>";
} else {
echo "<label>$key</label><input class='input-text' type='text' id='$key' name='$key' value='$value'/>";
if ((strpos($key,"URL") > 0 || $key == 'website')&& $value != "") {
@@ -89,13 +90,21 @@
//print_r($row);
if (sizeof($_POST) > 0) {
//print_r($_POST);
+ foreach ($_POST as $postkey => $postvalue) {
+ if ($postvalue == "") {
+ unset($_POST[$postkey]);
+ }
+ if (is_array($postvalue) && count($postvalue) == 1 && $postvalue[0] == "") {
+ unset($_POST[$postkey]);
+ }
+ }
if (isset($_POST['_id']) && $db->get_rev($_POST['_id']) == $_POST['_rev']) {
echo "Edited version was latest version, continue saving";
$newdoc = $_POST;
$newdoc['metadata']['lastModified'] = time();
$row = $db->save($newdoc);
} else {
- echo "ALERT doc revised by someone else while editing.";
+ echo "ALERT doc revised by someone else while editing. Document not saved.";
}
}
--- a/graph.php
+++ b/graph.php
@@ -15,7 +15,7 @@
$rows = $db->get_view("app", "byCanonicalName", null, true)->rows;
//print_r($rows);
foreach ($rows as $row) {
- echo "nodes[\"{$row->value->_id}\"] = graph.newNode({label: \"{$row->key}\"});" . PHP_EOL;
+ echo "nodes[\"{$row->id}\"] = graph.newNode({label: \"{$row->key}\"});" . PHP_EOL;
}
} catch (SetteeRestClientException $e) {
setteErrorHandler($e);
--- a/include/template.inc.php
+++ b/include/template.inc.php
@@ -19,11 +19,11 @@
<title>Disclosr</title>
<!-- Included CSS Files -->
- <link rel="stylesheet" href="<?php echo $basePath?>stylesheets/foundation.css">
- <link rel="stylesheet" href="<?php echo $basePath?>stylesheets/app.css">
+ <link rel="stylesheet" href="<?php echo $basePath ?>stylesheets/foundation.css">
+ <link rel="stylesheet" href="<?php echo $basePath ?>stylesheets/app.css">
<!--[if lt IE 9]>
- <link rel="stylesheet" href="<?php echo $basePath?>stylesheets/ie.css">
+ <link rel="stylesheet" href="<?php echo $basePath ?>stylesheets/ie.css">
<![endif]-->
@@ -44,7 +44,7 @@
<div class="eight columns hide-on-phones">
<strong class="right">
<a href="getAgency.php">Agencies</a>
- <a href="about.php">About/FAQ</a>
+ <a href="about.php">About/FAQ</a>
</strong>
</div>
</div>
@@ -55,7 +55,10 @@
<div class="container">
<?php }
- function include_footer() { ?>
+ function include_footer() {
+ global $basePath;
+ ?>
+
</div>
<!-- container -->
@@ -63,14 +66,13 @@
<!-- Included JS Files -->
- <script src="<?php echo $basePath?>javascripts/foundation.js"></script>
- <script src="<?php echo $basePath?>javascripts/app.js"></script>
+ <script src="<?php echo $basePath; ?>javascripts/foundation.js"></script>
+ <script src="<?php echo $basePath; ?>javascripts/app.js"></script>
<script src="http://code.jquery.com/jquery-1.7.1.min.js"></script>
</body>
</html>
-<?php }
-
+<?php }
?>
--- a/schemas/agency.json.php
+++ b/schemas/agency.json.php
@@ -5,7 +5,8 @@
"type" => "object",
"properties" => Array(
"name" => Array("type" => "string", "required" => true, "x-title" => "Name", "description" => "Name, most recent and broadest"),
- "short_name" => Array("type" => "string", "required" => false, "x-title" => "Short Name", "description" => "Name shortened, usually to an acronym"),
+ "shortName" => Array("type" => "string", "required" => false, "x-title" => "Short Name", "description" => "Name shortened, usually to an acronym"),
+ "foiEmail" => Array("type" => "string", "required" => false, "x-title" => "FOI Contact Email", "description" => "FOI contact email if not foi@"),
"otherNames" => Array("type" => "array", "required" => true, "x-title" => "Past/Other Names", "description" => "Other names for organisation",
"items" => Array("type" => "string")),
"foiBodies" => Array("type" => "array", "required" => true, "x-title" => "FOI Bodies", "description" => "Organisational units within this agency that are subject to FOI Act but are not autonomous",
@@ -29,7 +30,11 @@
"hasMailingList" => Array("type" => "string", "required" => true, "x-title" => "Has Mailing List", "description" => ""),
"hasTwitter" => Array("type" => "string", "required" => true, "x-title" => "Has Twitter", "description" => ""),
"hasFacebook" => Array("type" => "string", "required" => true, "x-title" => "Has Facebook", "description" => ""),
- "hasYouTube" => Array("type" => "string", "required" => true, "x-title" => "Has Youtube", "description" => ""),
+ "hasYouTube" => Array("type" => "string", "required" => true, "x-title" => "Has YouTube", "description" => ""),
+
+ "hasFlickr" => Array("type" => "string", "required" => true, "x-title" => "Has YouTube", "description" => ""),
+ "hasCCBY" => Array("type" => "string", "required" => true, "x-title" => "Has CC-BY", "description" => "Has any page licenced Creative Commons - Attribution"),
+
),
/* "org":{"type":"object",
"properties":{