Skip to content

Commit

Permalink
minor formatting fixes not caught while rebasing
Browse files Browse the repository at this point in the history
  • Loading branch information
CommanderStorm committed Jul 30, 2022
1 parent 4615b5a commit d040998
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:

env:
SCHEMATHESIS_BASE: st run $API_SCHEMA --checks=all --base-url="http://localhost:8080"
SCHEMATHESIS_REPORT: 'true'
SCHEMATHESIS_REPORT: "true"
SCHEMATHESIS_TOKEN: ${{ secrets.SCHEMATHESIS_TOKEN }}
SCHEMATHESIS_API_NAME: navigatum

Expand Down Expand Up @@ -105,4 +105,4 @@ jobs:
- api-tests
steps:
- run: curl -sSL -o /usr/local/bin/argocd https://github.com/argoproj/argo-cd/releases/latest/download/argocd-linux-amd64 && chmod +x /usr/local/bin/argocd
- run: argocd app actions run navigatum restart --kind Deployment --resource-name navigatum-server --auth-token ${{ secrets.ARGOCD_TOKEN }} --server ${{ secrets.ARGOCD_SERVER }}
- run: argocd app actions run navigatum restart --kind Deployment --resource-name navigatum-server --auth-token ${{ secrets.ARGOCD_TOKEN }} --server ${{ secrets.ARGOCD_SERVER }}
2 changes: 1 addition & 1 deletion data/sources/02_rooms-extended.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,4 @@
name: "8120.01.101 (Audimax im Galileo)"

# === MI ===
"5608.EG.150": {coords: {lat: 48.262263704348356, lon: 11.66808379149225}}
"5608.EG.150": { coords: { lat: 48.262263704348356, lon: 11.66808379149225 } }
13 changes: 8 additions & 5 deletions webclient/src/views/search/view-search.inc
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,14 @@
</router-link>
</li>
</ul>
<div class="search-comment nb_results">
{{ s.estimatedTotalHits > 20 ? "${{_.search.approx}}$ " : "" }}{{ s.estimatedTotalHits }} {{
s.estimatedTotalHits === 1 ? "${{_.search.result}}$" : "${{_.search.results}}$"
}}{{ s.estimatedTotalHits > 10 ? ", ${{_.view_search.max_results }}$" : ""}}
</div>
<p class="search-comment nb_results" v-if="s.estimatedTotalHits === 1">
{{ s.estimatedTotalHits }} ${{_.search.result}}$
</p>
<p class="search-comment nb_results" v-else>
{{ s.estimatedTotalHits > 20 ? "${{_.search.approx}}$ " : "" }} {{
s.estimatedTotalHits }} ${{_.search.results}}${{ s.estimatedTotalHits >
10 ? ", ${{_.view_search.max_results }}$" : ""}}
</p>
</section>
</template>
</div>

0 comments on commit d040998

Please sign in to comment.