Skip to content

Commit

Permalink
Merge branch 'develop' into v1
Browse files Browse the repository at this point in the history
  • Loading branch information
BenParizek committed Sep 4, 2019
2 parents cd29975 + 5028d6c commit e307774
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "barrelstrength/sprout-base-reports",
"description": "Common reports libraries for Sprout Plugins for Craft CMS",
"version": "1.3.7",
"version": "1.3.8",
"type": "yii-module",
"license": "proprietary",
"authors": [
Expand Down
8 changes: 0 additions & 8 deletions src/migrations/m190628_000000_fix_data_sources.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,13 @@ public function safeUp(): bool
$this->update($this->dataSourcesTable, [
'pluginHandle' => 'sprout-forms'
], ['id' => $dataSource['id']], [], false);
} else {
$this->update($this->dataSourcesTable, [
'viewContext' => 'sprout-forms'
], ['id' => $dataSource['id']], [], false);
}
} else {
// Let's default all to sprout reports
if ($this->db->columnExists($this->dataSourcesTable, 'pluginHandle')) {
$this->update($this->dataSourcesTable, [
'pluginHandle' => 'sprout-reports'
], ['id' => $dataSource['id']], [], false);
} else {
$this->update($this->dataSourcesTable, [
'viewContext' => 'sprout-reports'
], ['id' => $dataSource['id']], [], false);
}
}
}
Expand Down

0 comments on commit e307774

Please sign in to comment.