Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…into HEAD
  • Loading branch information
akshay kumar committed Nov 15, 2019
2 parents 9171fa4 + be3d85e commit 42a3ea9
Show file tree
Hide file tree
Showing 13 changed files with 94 additions and 11 deletions.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEPLATES/Bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: 🐛 Bug Report
about: Report errors and problems

---

**Description**
<!-- A clear and concise description of the problem. -->

**How to reproduce**
<!-- Code and/or config needed to reproduce the problem. -->

**Possible Solution**
<!--- Optional: only if you have suggestions on a fix/reason for the bug -->

**Additional context**
<!-- Optional: any other context about the problem: log messages, screenshots, etc. -->
12 changes: 12 additions & 0 deletions .github/ISSUE_TEPLATES/Feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: 🚀 Feature Request
about: RFC and ideas for new features and improvements

---

**Description**
<!-- A clear and concise description of the new feature. -->

**Example**
<!-- A simple example of the new feature in action (include PHP code, YAML config, etc.)
If the new feature changes an existing feature, include a simple before/after comparison. -->
13 changes: 13 additions & 0 deletions .github/ISSUE_TEPLATES/Support_question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
name: ⛔ Support Question
about: Visit https://support.uvdesk.com/ to learn more about how the uvdesk team can assist you

---

We use GitHub issues only to discuss about uvdesk bugs and new features. For customizations and extended support:

- Contact us at [email protected]
- Visit official support website (https://support.uvdesk.com/en/)
- Visit our community forums (https://forums.uvdesk.com)

Thanks!
11 changes: 11 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!--
Thank you for contributing to UVDesk! Please fill out this description template to help us to process your pull request.
-->

### 1. Why is this change necessary?


### 2. What does this change do, exactly?


### 3. Please link to the relevant issues (if any).
8 changes: 8 additions & 0 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Security Policy
===============

⚠ PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY, SEE BELOW.

If you have found a security issue in Uvdesk, please send the details to [email protected] and don't disclose it publicly until we can provide a fix for it.

Thanks!
13 changes: 13 additions & 0 deletions CHANGELOG-1.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@ CHANGELOG for 1.0.x

This changelog references any relevant changes introduced in 1.0 minor versions.

* 1.0.3 (2019-11-15)
* **Issue #24:** Customer can view other customers ticket just by passing ticket id in url
* **Issue #94:** Knowledgebase folders not displaying correct thumbnail
* **Misc. Updates:**
* Included Github issue templates
* Included "Powered by Uvdesk" to support center panel
* Updated composer dependencies & set minimum required php version to 7.2

* 1.0.2 (2019-10-22)
* **Issue #60:** Cannot disable knowledgebase
* **Issue #86:** Article Text Editor is not working with bullets
* **Issue #83:** Enable customer/agent to reset password from single route

* 1.0.1 (2019-10-15)
* **Issue #79:** User profile gets hidden
* **Issue #75:** Profile issue inside ticket page
Expand Down
4 changes: 4 additions & 0 deletions Controller/Article.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ class Article extends Controller
{
public function articleList(Request $request)
{
if (!$this->get('user.service')->isAccessAuthorized('ROLE_AGENT_MANAGE_KNOWLEDGEBASE')) {
return $this->redirect($this->generateUrl('helpdesk_member_dashboard'));
}

$solutions = $this->getDoctrine()
->getRepository('UVDeskSupportCenterBundle:Solutions')
->getAllSolutions(null, $this->container, 'a.id, a.name');
Expand Down
7 changes: 3 additions & 4 deletions Controller/Ticket.php
Original file line number Diff line number Diff line change
Expand Up @@ -352,14 +352,13 @@ public function ticketView($id, Request $request)
$this->isWebsiteActive();

$entityManager = $this->getDoctrine()->getManager();
$ticket = $entityManager->getRepository(TicketEntity::class)->findOneById($id);

$user = $this->get('user.service')->getSessionUser();
$ticket = $entityManager->getRepository(TicketEntity::class)->findOneBy(['id' => $id, 'customer' => $user]);

if (empty($ticket)) {
throw new NotFoundHttpException('Page Not Found!');
}

$user = $this->get('user.service')->getSessionUser();

if (!empty($user) && $user->getId() == $ticket->getCustomer()->getId()) {
$ticket->setIsCustomerViewed(1);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
<div class="uv-aside-brick">
<div class="uv-aside-customer-block">
<div class="uv-aside-avatar">
{# <img src="{{solution.solutionImage ? solution.solutionImage : defaultImage}}"> #}
<img src="https://s3-ap-southeast-1.amazonaws.com/cdn.uvdesk.com/website/183/im%2Cas.png">
<img src="{{solution.solutionImage ? app.request.scheme ~'://' ~ app.request.httpHost ~ asset('') ~ (solution.solutionImage) : defaultImage}}">
</div>
<div class="uv-aside-customer-info">
<span class="uv-customize"></span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
<div class="uv-aside-brick">
<div class="uv-aside-customer-block">
<div class="uv-aside-avatar">
{# <img src="{{solution.solutionImage ? solution.solutionImage : defaultImage}}"> #}
<img src="https://s3-ap-southeast-1.amazonaws.com/cdn.uvdesk.com/website/183/im%2Cas.png">
<img src="{{solution.solutionImage ? app.request.scheme ~'://' ~ app.request.httpHost ~ asset('') ~ (solution.solutionImage) : defaultImage}}">
</div>
<div class="uv-aside-customer-info">
<span class="uv-customize"></span>
Expand Down
5 changes: 4 additions & 1 deletion Resources/views/Templates/footer.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,8 @@
</ul>
</div>
</div>
<div class="uv-footer-credit">
<span class="uv-credit-text">Powered by <a href="https://www.uvdesk.com" target="_blank">UVdesk</a></span>
</div>
</div>
</div>
</div>
5 changes: 5 additions & 0 deletions UIComponents/Dashboard/Navigation/Knowledgebase.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ public static function getRouteName() : string
return 'helpdesk_member_knowledgebase_folders_collection';
}

public static function getRoles() : array
{
return ['ROLE_AGENT_MANAGE_KNOWLEDGEBASE'];
}

public function getChildrenRoutes() : array
{
return [];
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
}
],
"require": {
"php": "^7.1.3",
"php": "^7.2",
"uvdesk/composer-plugin": "^1.0",
"uvdesk/core-framework": "^1.0"
"uvdesk/core-framework": "^1.0.4"
},
"autoload": {
"psr-4": { "Webkul\\UVDesk\\SupportCenterBundle\\": "" }
Expand Down

0 comments on commit 42a3ea9

Please sign in to comment.