Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
taskonsite-архив-перенесен
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Korolev
taskonsite-архив-перенесен
Commits
3b91dbde
Commit
3b91dbde
authored
Mar 14, 2016
by
Олег Гиммельшпах
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small fix redmine fix
parent
119ec16e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
16 deletions
+39
-16
common/modules/support/controllers/SupportController.php
common/modules/support/controllers/SupportController.php
+18
-10
common/modules/support/models/redmine/Issue.php
common/modules/support/models/redmine/Issue.php
+6
-1
common/modules/support/models/redmine/RedmineHelper.php
common/modules/support/models/redmine/RedmineHelper.php
+2
-0
common/modules/support/views/support/create.php
common/modules/support/views/support/create.php
+13
-5
No files found.
common/modules/support/controllers/SupportController.php
View file @
3b91dbde
...
...
@@ -5,6 +5,7 @@ namespace common\modules\support\controllers;
use
Yii
;
use
yii\filters\AccessControl
;
use
yii\helpers\ArrayHelper
;
use
yii\helpers\Html
;
use
yii\web\Controller
;
use
yii\web\Response
;
use
yii\web\NotFoundHttpException
;
...
...
@@ -127,19 +128,26 @@ class SupportController extends Controller
{
if
(
$_FILES
[
'files'
])
{
$client
=
$this
->
getClient
();
$html
=
''
;
foreach
(
$_FILES
[
'files'
][
'name'
]
as
$i
=>
$name
)
{
$client
=
$this
->
getClient
();
$response
=
json_decode
(
$client
->
attachment
->
upload
(
@
file_get_contents
(
$_FILES
[
'files'
][
'tmp_name'
][
$i
])));
$html
.=
$this
->
renderPartial
(
'_file'
,
[
'name'
=>
$name
,
'size'
=>
RedmineHelper
::
formatSize
(
$_FILES
[
'files'
][
'size'
][
$i
]),
'token'
=>
$response
->
upload
->
token
,
'type'
=>
$_FILES
[
'files'
][
'type'
][
$i
]
]);
if
(
$_FILES
[
'files'
][
'size'
][
$i
]
<=
RedmineHelper
::
MAX_FILE_SIZE
)
{
$response
=
json_decode
(
$client
->
attachment
->
upload
(
@
file_get_contents
(
$_FILES
[
'files'
][
'tmp_name'
][
$i
])));
$html
.=
$this
->
renderPartial
(
'_file'
,
[
'name'
=>
$name
,
'size'
=>
RedmineHelper
::
formatSize
(
$_FILES
[
'files'
][
'size'
][
$i
]),
'token'
=>
$response
->
upload
->
token
,
'type'
=>
$_FILES
[
'files'
][
'type'
][
$i
]
]);
}
else
{
$html
.=
Html
::
tag
(
'div'
,
'Превышен максимально допустимый размер файла <a class="delete-file" href="#"><span class="glyphicon glyphicon-remove color_gray"></span></a>'
,
[
'class'
=>
'file_box_wr'
]);
}
}
return
[
...
...
common/modules/support/models/redmine/Issue.php
View file @
3b91dbde
...
...
@@ -29,7 +29,12 @@ class Issue extends yii\base\Model
public
function
rules
()
{
return
[
[[
'tracker_id'
,
'project_id'
,
'status_id'
,
'priority_id'
,
'description'
],
'required'
],
[[
'tracker_id'
,
'status_id'
,
'priority_id'
],
'required'
],
[[
'project_id'
],
'required'
,
'message'
=>
'Выберите проект, к которому относится новая задача'
],
[[
'subject'
],
'required'
,
'message'
=>
'Введите наименование задачи'
],
[[
'description'
],
'required'
,
'message'
=>
'Укажите описание задачи'
],
[[
'tracker_id'
,
'project_id'
,
'status_id'
,
'priority_id'
],
'integer'
],
[[
'description'
],
'string'
],
[[
'files'
],
'safe'
],
...
...
common/modules/support/models/redmine/RedmineHelper.php
View file @
3b91dbde
...
...
@@ -6,6 +6,8 @@ use common\models\Settings;
class
RedmineHelper
{
const
MAX_FILE_SIZE
=
5242880
;
//5mb
public
static
function
sortIsuues
(
$issues
=
null
)
{
if
(
$issues
)
...
...
common/modules/support/views/support/create.php
View file @
3b91dbde
...
...
@@ -28,15 +28,15 @@ use common\modules\support\models\redmine\RedmineHelper;
<div
class=
"row"
>
<div
class=
"col-sm-12"
>
<?=
$form
->
field
(
$model
,
'subject'
,
[
'template'
=>
"<p class='label_p'><strong>
{
label}</strong></p>\n{input}\n{hint}\n{error
}
"
])
->
textInput
([
'maxlength'
=>
255
,
'placeholder'
=>
'Дизайн оформления витринных окон для ресторана Subway'
])
?>
</div>
<div
class=
"col-md-3 col-xs-6 col-sm-12"
>
<?php
$projects
=
RedmineHelper
::
sortMemberships
(
$user
[
'user'
][
'memberships'
])
?>
<?=
$form
->
field
(
$model
,
'project_id'
,
[
'template'
=>
"<p class='label_p'><strong>
{
label}</strong></p>\n{input}\n{hint}\n{error
}
"
])
->
dropDownList
(
$projects
,
(
count
(
$projects
)
>
1
?
[
'prompt'
=>
'Выберите проект'
]
:
[]))
?>
</div>
<div
class=
"col-md-3 col-xs-6 col-sm-12"
>
<div
class=
"col-sm-12"
>
<?=
$form
->
field
(
$model
,
'subject'
,
[
'template'
=>
"<p class='label_p'><strong>
{
label}</strong></p>\n{input}\n{hint}\n{error
}
"
])
->
textInput
([
'maxlength'
=>
255
,
'placeholder'
=>
'Дизайн оформления витринных окон для ресторана Subway'
])
?>
</div>
<div
class=
"col-sm-12"
>
<?=
$form
->
field
(
$model
,
'priority_id'
,
[
'template'
=>
"<p class='label_p'><strong>
{
label
}
</strong></p>
\n
<div class='important_box important_button_text'>
{
input
}
<p class='important_button_text_1'>Важная</p>
...
...
@@ -190,6 +190,14 @@ use common\modules\support\models\redmine\RedmineHelper;
font-size
:
9px
;
line-height
:
16px
;
}
.help-block
{
font-size
:
12px
;
line-height
:
10px
;
margin
:
-10px
0
25px
;
}
.container_white
.form-control
{
float
:
none
;
}
</style>
<?=
$this
->
render
(
'@app/views/layouts/footer'
);
?>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment