Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchCourrier
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Harbor Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchCourrier
Commits
4abedf48
Commit
4abedf48
authored
7 years ago
by
Damien
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop
parents
63bd779e
eac44b05
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/maarch_entreprise/actions/index_mlb.php
+6
-5
6 additions, 5 deletions
apps/maarch_entreprise/actions/index_mlb.php
apps/maarch_entreprise/admin/history_batch/history_batch.php
+146
-156
146 additions, 156 deletions
apps/maarch_entreprise/admin/history_batch/history_batch.php
with
152 additions
and
161 deletions
apps/maarch_entreprise/actions/index_mlb.php
+
6
−
5
View file @
4abedf48
...
@@ -817,13 +817,14 @@ function get_form_txt($values, $pathManageAction, $actionId, $table, $module, $
...
@@ -817,13 +817,14 @@ function get_form_txt($values, $pathManageAction, $actionId, $table, $module, $
$frmStr
.
=
'selected="selected"'
;
$frmStr
.
=
'selected="selected"'
;
}
}
$frmStr
.
=
'>'
.
functions
::
xssafe
(
$statuses
[
$i
][
'LABEL'
])
.
'</option>'
;
$frmStr
.
=
'>'
.
functions
::
xssafe
(
$statuses
[
$i
][
'LABEL'
])
.
'</option>'
;
}
$frmStr
.
=
'</select></td><td><span class="red_asterisk" id="market_mandatory" '
$frmStr
.
=
'</select></td><td><span class="red_asterisk" id="market_mandatory" '
.
'style="display:inline;"><i class="fa fa-star"></i></span> </td>'
;
.
'style="display:inline;"><i class="fa fa-star"></i></span> </td>'
;
$frmStr
.
=
'</tr>'
;
$frmStr
.
=
'</tr>'
;
$frmStr
.
=
'<script>$j("#status").chosen({width: "226px", disable_search_threshold: 10, search_contains: true});</script>'
;
$frmStr
.
=
'<script>$j("#status").chosen({width: "226px", disable_search_threshold: 10, search_contains: true});</script>'
;
}
$frmStr
.
=
'</table>'
;
$frmStr
.
=
'</table>'
;
$frmStr
.
=
'</div>'
;
$frmStr
.
=
'</div>'
;
...
...
This diff is collapsed.
Click to expand it.
apps/maarch_entreprise/admin/history_batch/history_batch.php
+
146
−
156
View file @
4abedf48
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment