Skip to content

Commit

Permalink
Merge branch 'main' into prod-helm-deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
CS76 committed Jun 24, 2024
2 parents ed2d984 + 84991c9 commit d844dbb
Show file tree
Hide file tree
Showing 6 changed files with 1,080 additions and 786 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [1.3.1](https://github.com/NFDI4Chem/nmrxiv/compare/v1.3.0...v1.3.1) (2024-06-24)


### Bug Fixes

* composer lock update ([42c86fc](https://github.com/NFDI4Chem/nmrxiv/commit/42c86fc47828464477c7eaa9e989126849e16246))
* study tags save issue fix and ct logo update ([497471c](https://github.com/NFDI4Chem/nmrxiv/commit/497471cdc2562d062f076990d584391c5bd3153c))

## [1.3.0](https://github.com/NFDI4Chem/nmrxiv/compare/v1.2.1...v1.3.0) (2024-06-19)


Expand Down
2 changes: 1 addition & 1 deletion app/Actions/Study/UpdateStudy.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function update(Study $study, array $input)
])->save();

if (array_key_exists('tags_array', $input)) {
$study->syncTagsWithType(array_filter($input['tags_array']), 'Study');
$study->syncTagsWithType($input['tags_array'], 'Study');
}

$is_public = array_key_exists('is_public', $input) ? $input['is_public'] : $study->is_public;
Expand Down
2 changes: 2 additions & 0 deletions app/Console/Commands/PublishReleasedProjects.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ public function handle(PublishProject $publisher)
$release_date = Carbon::parse($project->release_date);
if ($release_date->isPast()) {
if (! is_null($project->doi) && ! $project->is_archived) {
// echo($project->identifier);
// echo("\r\n");
$publisher->publish($project);
Notification::send($project->owner, new DraftProcessedNotification($project));
}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"spatie/laravel-permission": "^5.1",
"spatie/laravel-query-builder": "^5.6",
"spatie/laravel-support-bubble": "^1.2",
"spatie/laravel-tags": "^4.3",
"spatie/laravel-tags": "^4.6.1",
"spatie/laravel-welcome-notification": "^2.3.2",
"spatie/schema-org": "^3.11",
"tightenco/ziggy": "^1.0"
Expand Down
Loading

0 comments on commit d844dbb

Please sign in to comment.