Fixes
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 1m37s
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 1m37s
This commit is contained in:
parent
dcdc2d1b22
commit
748f9a289b
19
.gitea/workflows/run_tests.yaml
Normal file
19
.gitea/workflows/run_tests.yaml
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
name: Gitea Actions Demo
|
||||||
|
run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
|
||||||
|
on: [push]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
Explore-Gitea-Actions:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."
|
||||||
|
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
|
||||||
|
- run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
|
||||||
|
- name: Check out repository code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner."
|
||||||
|
- run: echo "🖥️ The workflow is now ready to test your code on the runner."
|
||||||
|
- name: List files in the repository
|
||||||
|
run: |
|
||||||
|
ls ${{ gitea.workspace }}
|
||||||
|
- run: echo "🍏 This job's status is ${{ job.status }}."
|
||||||
@ -1,4 +1,4 @@
|
|||||||
DOCKER_REGISTRY=registry.gitlab.com/printshopcreator
|
DOCKER_REGISTRY=registry.thomas-peterson.de/printshopcreator
|
||||||
DOCKER_NAMESPACE=docker
|
DOCKER_NAMESPACE=docker
|
||||||
|
|
||||||
APP_USER_NAME=application
|
APP_USER_NAME=application
|
||||||
|
|||||||
@ -58,6 +58,7 @@ class ProductSearchType extends AbstractType
|
|||||||
->andWhere("
|
->andWhere("
|
||||||
(product.uid LIKE '%" . $values['value'] . "%' OR
|
(product.uid LIKE '%" . $values['value'] . "%' OR
|
||||||
product.title LIKE '%" . $values['value'] . "%' OR
|
product.title LIKE '%" . $values['value'] . "%' OR
|
||||||
|
product.subTitle LIKE '%" . $values['value'] . "%' OR
|
||||||
product.calcXml LIKE '%" . $values['value'] . "%' OR
|
product.calcXml LIKE '%" . $values['value'] . "%' OR
|
||||||
product.textFormat LIKE '%" . $values['value'] . "%' OR
|
product.textFormat LIKE '%" . $values['value'] . "%' OR
|
||||||
product.description LIKE '%" . $values['value'] . "%' OR
|
product.description LIKE '%" . $values['value'] . "%' OR
|
||||||
|
|||||||
@ -9,6 +9,8 @@ changed: Geändert
|
|||||||
Yes: Ja
|
Yes: Ja
|
||||||
No: Nein
|
No: Nein
|
||||||
Name: Name
|
Name: Name
|
||||||
|
Title: Titel
|
||||||
|
Subtitle: Untertitel
|
||||||
NoIntern: Nr. Intern
|
NoIntern: Nr. Intern
|
||||||
Producttype: Produkttyp
|
Producttype: Produkttyp
|
||||||
Productgroups: Produktgruppen
|
Productgroups: Produktgruppen
|
||||||
|
|||||||
@ -70,7 +70,8 @@
|
|||||||
<th>{{ knp_pagination_sortable(pagination, 'Sales'|trans, 'product.buyed') }}</th>
|
<th>{{ knp_pagination_sortable(pagination, 'Sales'|trans, 'product.buyed') }}</th>
|
||||||
<th>{{ knp_pagination_sortable(pagination, 'generated'|trans, 'product.createdAt') }}</th>
|
<th>{{ knp_pagination_sortable(pagination, 'generated'|trans, 'product.createdAt') }}</th>
|
||||||
<th>{{ knp_pagination_sortable(pagination, 'changed'|trans, 'product.updatedAt') }}</th>
|
<th>{{ knp_pagination_sortable(pagination, 'changed'|trans, 'product.updatedAt') }}</th>
|
||||||
<th>{{ knp_pagination_sortable(pagination, 'Name'|trans, 'product.title') }}</th>
|
<th>{{ knp_pagination_sortable(pagination, 'Title'|trans, 'product.title') }}</th>
|
||||||
|
<th>{{ knp_pagination_sortable(pagination, 'Subtitle'|trans, 'product.subTitle') }}</th>
|
||||||
<th>{{ knp_pagination_sortable(pagination, 'NoIntern'|trans, 'product.nrIntern') }}</th>
|
<th>{{ knp_pagination_sortable(pagination, 'NoIntern'|trans, 'product.nrIntern') }}</th>
|
||||||
<th>{{ knp_pagination_sortable(pagination, 'Producttype'|trans, 'product.type') }}</th>
|
<th>{{ knp_pagination_sortable(pagination, 'Producttype'|trans, 'product.type') }}</th>
|
||||||
<th>{{ "Productgroups"|trans }}</th>
|
<th>{{ "Productgroups"|trans }}</th>
|
||||||
@ -90,6 +91,7 @@
|
|||||||
<td>{{ product.createdAt|date('H:i d.m.Y') }}</td>
|
<td>{{ product.createdAt|date('H:i d.m.Y') }}</td>
|
||||||
<td>{{ product.updatedAt|date('H:i d.m.Y') }}</td>
|
<td>{{ product.updatedAt|date('H:i d.m.Y') }}</td>
|
||||||
<td>{{ product.title }}</td>
|
<td>{{ product.title }}</td>
|
||||||
|
<td>{{ product.subTitle }}</td>
|
||||||
<td>{{ product.nrIntern }}</td>
|
<td>{{ product.nrIntern }}</td>
|
||||||
<td>{{ product.type|productType }}</td>
|
<td>{{ product.type|productType }}</td>
|
||||||
<td>{% for productGroup in product.productGroups %}{{ productGroup.title }}{% if loop.last != true %}, {% endif %}{% endfor %}</td>
|
<td>{% for productGroup in product.productGroups %}{{ productGroup.title }}{% if loop.last != true %}, {% endif %}{% endfor %}</td>
|
||||||
|
|||||||
@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
class SearchController extends TP_Controller_Action
|
class SearchController extends TP_Controller_Action
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SearchAction
|
* SearchAction
|
||||||
*
|
*
|
||||||
@ -46,7 +45,7 @@ class SearchController extends TP_Controller_Action
|
|||||||
->where(
|
->where(
|
||||||
"c.shop_id = ?
|
"c.shop_id = ?
|
||||||
AND c.enable = 1 AND c.display_not_in_overview = 0
|
AND c.enable = 1 AND c.display_not_in_overview = 0
|
||||||
AND (c.meta_keywords LIKE '%" . $searchQuery . "%' OR c.title LIKE '%" . $searchQuery . "%' OR c.kostenstelle LIKE '%" . $searchQuery . "%' OR c.article_nr_intern LIKE '%" . $searchQuery . "%' OR c.info LIKE '%" . $searchQuery . "%' OR c.einleitung LIKE '%" . $searchQuery . "%')",
|
AND (c.meta_keywords LIKE '%" . $searchQuery . "%' OR c.sub_title LIKE '%" . $searchQuery . "%' OR c.title LIKE '%" . $searchQuery . "%' OR c.kostenstelle LIKE '%" . $searchQuery . "%' OR c.article_nr_intern LIKE '%" . $searchQuery . "%' OR c.info LIKE '%" . $searchQuery . "%' OR c.einleitung LIKE '%" . $searchQuery . "%')",
|
||||||
array($this->shop->id)
|
array($this->shop->id)
|
||||||
)
|
)
|
||||||
->orderBy('c.pos ASC')
|
->orderBy('c.pos ASC')
|
||||||
@ -120,7 +119,8 @@ class SearchController extends TP_Controller_Action
|
|||||||
|
|
||||||
protected function getAccountArticle($articles, $account_id, $deep = 1)
|
protected function getAccountArticle($articles, $account_id, $deep = 1)
|
||||||
{
|
{
|
||||||
if($deep == 4) { return $articles;
|
if ($deep == 4) {
|
||||||
|
return $articles;
|
||||||
}
|
}
|
||||||
$account_article = Doctrine_Query::create()->from('AccountArticle c')->where('c.account_id = ?', array($account_id))->execute()->toArray();
|
$account_article = Doctrine_Query::create()->from('AccountArticle c')->where('c.account_id = ?', array($account_id))->execute()->toArray();
|
||||||
$account = Doctrine_Query::create()->from('Account a')->where('a.id = ?', array($account_id))->fetchOne();
|
$account = Doctrine_Query::create()->from('Account a')->where('a.id = ?', array($account_id))->fetchOne();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user