summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrashant S2017-03-01 17:01:27 +0530
committerGitHub2017-03-01 17:01:27 +0530
commitacbad6d52bad5b5cc85bc9e8a4f24e3922fe3f4a (patch)
treece65e939c86a8ab40a59df3ac037015cfa2478e2
parenta36ce35db402dcf3f45a6d9e871d4f7c94606758 (diff)
parent1d6c48c055acb670ea0547800e07b599e25467f5 (diff)
downloaddwsim_flowsheet-acbad6d52bad5b5cc85bc9e8a4f24e3922fe3f4a.tar.gz
dwsim_flowsheet-acbad6d52bad5b5cc85bc9e8a4f24e3922fe3f4a.tar.bz2
dwsim_flowsheet-acbad6d52bad5b5cc85bc9e8a4f24e3922fe3f4a.zip
Merge pull request #2 from prashantsinalkar/drupal_7.x
done minor changes
-rwxr-xr-xdwsim_flowsheet.module2
-rwxr-xr-xproposal.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/dwsim_flowsheet.module b/dwsim_flowsheet.module
index 48a865f..e3cdb7e 100755
--- a/dwsim_flowsheet.module
+++ b/dwsim_flowsheet.module
@@ -670,7 +670,7 @@ function _df_list_of_dwsim_compound()
$dwsim_compound = array();
$query = db_select('dwsim_flowsheet_compounds_from_dwsim');
$query->fields('dwsim_flowsheet_compounds_from_dwsim');
- $query->orderBy('id', 'ASC');
+ $query->orderBy('compound', 'ASC');
$dwsim_compound_list = $query->execute();
while ($dwsim_compound_list_data = $dwsim_compound_list->fetchObject())
{
diff --git a/proposal.inc b/proposal.inc
index 6564ae7..41a6508 100755
--- a/proposal.inc
+++ b/proposal.inc
@@ -26,7 +26,7 @@ function dwsim_flowsheet_proposal_form($form, &$form_state, $no_js_use = FALSE)
/************************ start approve book details ************************/
if ($user->uid == 0)
{
- $msg = drupal_set_message(t('It is mandatory to ' . l('login', 'user') . ' on this website to access the lab proposal form. If you are new user please create a new account first.'), 'error');
+ $msg = drupal_set_message(t('It is mandatory to ' . l('login', 'user') . ' on this website to access the flowsheet proposal form. If you are new user please create a new account first.'), 'error');
//drupal_goto('dwsim-flowsheet-project');
drupal_goto('user');
return $msg;