diff --git a/Digita11y/Base.lproj/Main.storyboard b/Digita11y/Base.lproj/Main.storyboard index d142bff..f4ed578 100644 --- a/Digita11y/Base.lproj/Main.storyboard +++ b/Digita11y/Base.lproj/Main.storyboard @@ -1,7 +1,7 @@ - + - + @@ -589,7 +589,6 @@ - diff --git a/Digita11y/Controllers/BrowseTableViewController.swift b/Digita11y/Controllers/BrowseTableViewController.swift index bc48691..1815538 100644 --- a/Digita11y/Controllers/BrowseTableViewController.swift +++ b/Digita11y/Controllers/BrowseTableViewController.swift @@ -38,6 +38,7 @@ class BrowseTableViewController: BaseTableViewController, RWFrameworkProtocol { cell.tag = self.exhibitionViewModel?.IDForIndex(indexPath.row) ?? 0 cell.titleLabel.text = self.exhibitionViewModel?.titleForIndex(indexPath.row) ?? "" cell.accessibilityLabel = self.exhibitionViewModel?.accessibilityLabelForIndex(indexPath.row) ?? "" + cell.accessibilityTraits = UIAccessibilityTraitButton; cell.bannerImageView.sd_setImageWithURL(self.exhibitionViewModel?.imageURLForIndex(indexPath.row), placeholderImage: UIImage(named:"browse-cell")) return cell diff --git a/Digita11y/Info.plist b/Digita11y/Info.plist index 970f30e..2068605 100644 --- a/Digita11y/Info.plist +++ b/Digita11y/Info.plist @@ -19,7 +19,7 @@ CFBundleSignature ???? CFBundleVersion - 34 + 35 LSRequiresIPhoneOS NSLocationWhenInUseUsageDescription diff --git a/Digita11y/Models/Asset.swift b/Digita11y/Models/Asset.swift index 9692a1b..f7c39c1 100644 --- a/Digita11y/Models/Asset.swift +++ b/Digita11y/Models/Asset.swift @@ -13,6 +13,7 @@ private var TextCache = [String:String]() struct Asset { var assetDescription = "" + var submitted: Bool = false var volume = 0 var project = 0 var assetID = 0 @@ -28,6 +29,7 @@ struct Asset { init(json: JSON) { assetDescription = json["description"].string ?? "" + submitted = json["submitted"].boolValue ?? false volume = json["volume"].int ?? 0 project = json["project"].int ?? 0 assetID = json["asset_id"].int ?? 0 diff --git a/Digita11y/Operations/RequestAssets.swift b/Digita11y/Operations/RequestAssets.swift index 46eb12b..fab6471 100644 --- a/Digita11y/Operations/RequestAssets.swift +++ b/Digita11y/Operations/RequestAssets.swift @@ -11,7 +11,7 @@ func requestAssets(completion: (assets: [Asset]) -> ()) { if (data != nil) { let json = JSON(data: data!) let assets = json.array?.map { Asset(json: $0) } ?? [] - completion(assets: assets) + completion(assets: assets.filter { $0.submitted }) } }) { (error) -> Void in debugPrintln(error.localizedDescription)