Merge pull request #200 from infograf768/lang_save_id_client

Solving issues with new language save

component/admin/controllers/language.php

@@ -76,21 +76,16 @@ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 		$input = JFactory::getApplication()->input;
 		$client = $input->get('client', '');
 
-		if (empty($client))
-		{
-			$select = $input->get('filters', array(), 'array');
-			$client = isset($select['select']['client']) ? $select['select']['client'] : 'site';
-		}
-
 		if (empty($client))
 		{
 			$data = $input->get('jform', array(), 'array');
-			$client = isset($data['client']) ? $data['client'] : 'site';
+			$client = $data['client'];
 		}
 
 		if (empty($client))
 		{
-			$client = 'site';
+			$select = $input->get('filters', array(), 'array');
+			$client = isset($select['select']['client']) ? $select['select']['client'] : 'site';
 		}
 
 		$tag = $input->get('tag', '');

component/admin/models/language.php

@@ -103,6 +103,12 @@ public function getForm($data = array(), $loadData = true)
 		// Get the form.
 		$form = $this->loadForm('com_localise.language', 'language', array('control'   => 'jform', 'load_data' => $loadData));
 
+		// Make Client field readonly when the file exists
+		if ($this->getState('language.id'))
+		{
+			$form->setFieldAttribute('client', 'readonly', 'true');
+		}
+
 		return $form;
 	}
 
@@ -371,6 +377,10 @@ public function save($data = array())
 			}
 
 			$id = LocaliseHelper::getFileId($path);
+
+			// Dummy call to populate state
+			$this->getState('language.id');
+
 			$this->setState('language.id', $id);
 
 			// Bind the rules.