? ? ? Pending

User tests: Successful: Unsuccessful:

avatar rdeutz
rdeutz
7 May 2017

Pull Request for Issue #13999.

Summary of Changes

Added a function to checkin item from the associations view.

Testing Instructions

  • Go to Components > Multilingual Association
  • Filter by articles and english language (it can be another component and/or language)
  • Open a Multilingual Association from the results
  • Don't click close button, just open a new tab and go to Components > Multilingual Association, so the association will we locked and you will see the lock icon

Before Patch

If you click on check-in icon, nothing happens.

After Patch

The item is checked in.

Please also test with other items as articles

avatar rdeutz rdeutz - open - 7 May 2017
avatar rdeutz rdeutz - change - 7 May 2017
Status New Pending
avatar joomla-cms-bot joomla-cms-bot - change - 7 May 2017
Category Administration com_associations Language & Strings
avatar rdeutz
rdeutz - comment - 7 May 2017

Unfortunately, I had to change the language file, I will merge this anyway even if we don't have the time to let all translation teams translate the term.

@brianteeman can you have a look at the sentence I would call english :-)

avatar infograf768
infograf768 - comment - 7 May 2017

check-in if I do not mistake (it is at least the way it is displayed in the toolbar)

avatar brianteeman
brianteeman - comment - 7 May 2017

we have a style guide - please us it

avatar rdeutz rdeutz - change - 7 May 2017
Labels Added: ? ?
avatar rdeutz
rdeutz - comment - 7 May 2017

fixing a bug 1 hour; making the comments right several hours ;-)

avatar infograf768
infograf768 - comment - 7 May 2017

I do not want to be the bad boy here but I confirm we use check-in 44 times in en-GB lang files...

avatar rdeutz
rdeutz - comment - 7 May 2017

so it is wrong 44 time :-P

avatar brianteeman
brianteeman - comment - 7 May 2017

or maybe it is being used according to the style guide 44 times.

avatar infograf768
infograf768 - comment - 8 May 2017

My test:

  1. This works fine when an item displayed in the list has been checked out by the same user who is using multilingual associations. In that sense it solves #13999

If the item is marked as checked-out, one can check it in and then click to open the side by side.

  1. Now, when another user (with no check in ability) is with another browser displaying an item which has been checkedout, we do not get the grey lock but only an absence of link:

Example:
screen shot 2017-05-08 at 10 21 29

We can get this instead
screen shot 2017-05-08 at 10 30 36

with this change:
Add line 129 of /administrator/components/com_associations/views/associations/tmpl/default.php

						<?php if (!$canCheckin && $isCheckout) : ?>
							<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'associations.'); ?>
						<?php endif; ?>

just before

						<?php if ($canCheckin && $isCheckout) : ?>
							<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'associations.', $canCheckin); ?>
						<?php endif; ?>
avatar infograf768
infograf768 - comment - 8 May 2017

Note: I am preparing a PR to solve also a checked out issue in the side by side view.

avatar infograf768
infograf768 - comment - 8 May 2017

See also #15889

avatar stellainformatica
stellainformatica - comment - 9 May 2017

I have tested this item successfully on 3f301d1

Patch test successfully, with JM patch modification.


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/15873.

avatar stellainformatica stellainformatica - test_item - 9 May 2017 - Tested successfully
avatar AlexRed
AlexRed - comment - 9 May 2017

I have tested this item successfully on 3f301d1

Patch ok for me


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/15873.

avatar AlexRed AlexRed - test_item - 9 May 2017 - Tested successfully
avatar franz-wohlkoenig franz-wohlkoenig - change - 10 May 2017
Status Pending Ready to Commit
avatar franz-wohlkoenig
franz-wohlkoenig - comment - 10 May 2017

RTC after two successful tests.

avatar infograf768
infograf768 - comment - 10 May 2017

@franz-wohlkoenig
We wait for @rdeutz to merge rdeutz#14

avatar rdeutz rdeutz - change - 10 May 2017
Labels Added: ?
avatar infograf768
infograf768 - comment - 10 May 2017

I have tested this item successfully on 8acee88


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/15873.

avatar infograf768 infograf768 - test_item - 10 May 2017 - Tested successfully
avatar infograf768 infograf768 - alter_testresult - 10 May 2017 - stellainformatica: Tested successfully
avatar infograf768
infograf768 - comment - 10 May 2017

@rdeutz
Can now be merged and thanks!

avatar infograf768
infograf768 - comment - 10 May 2017

Note: as soon as we are ready to release 3.7.1, we will let it know to TTs about the new string, but I was unable for now to reproduce an error using it.

avatar infograf768 infograf768 - change - 10 May 2017
Status Ready to Commit Fixed in Code Base
Closed_Date 0000-00-00 00:00:00 2017-05-10 14:54:25
Closed_By infograf768
avatar infograf768 infograf768 - close - 10 May 2017
avatar infograf768 infograf768 - merge - 10 May 2017

Add a Comment

Login with GitHub to post a comment